* Add new DEB_REMOVE_FILES_$package variable designed for removing

[config-package-dev.git] / divert.mk

diff --git a/divert.mk b/divert.mk
index 30fb02e072a92d4d717812d5058fe5f06712e680..bab17704484ce254f73d8e3dd5473b8e82d5ddaf 100644 (file)
--- a/divert.mk
+++ b/divert.mk
@@ -20,13 +20,16 @@
 ifndef _cdbs_rules_divert
 _cdbs_rules_divert = 1
 
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), config-package-dev
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), config-package-dev (>= 4.4)
 
 DEB_DIVERT_SCRIPT = /usr/share/config-package-dev/divert.sh.in
 
 DEB_DIVERT_PACKAGES += $(foreach package,$(DEB_ALL_PACKAGES), \
     $(if $(DEB_REPLACE_FILES_$(package)),$(package), \
-    $(if $(DEB_DIVERT_FILES_$(package)),$(package))))
+    $(if $(DEB_REMOVE_FILES_$(package)),$(package), \
+    $(if $(DEB_UNREMOVE_FILES_$(package)),$(package), \
+    $(if $(DEB_UNDIVERT_FILES_$(package)),$(package), \
+    $(if $(DEB_DIVERT_FILES_$(package)),$(package)))))))
 
 ifeq ($(DEB_DIVERT_EXTENSION),)
 DEB_DIVERT_EXTENSION = .divert
@@ -34,33 +37,58 @@ endif
 
 DEB_DIVERT_ENCODER = /usr/share/config-package-dev/encode
 
+divert_files_replace_name = $(shell echo $(1) | perl -pe 's/(.*)\Q$(DEB_DIVERT_EXTENSION)\E/$$1$(2)/')
+
 debian-divert/%: package = $(subst debian-divert/,,$@)
-debian-divert/%: replace_inputs = $(DEB_REPLACE_FILES_$(package))
-debian-divert/%: replace_files = $(foreach file,$(replace_inputs),$(file))
-debian-divert/%: divert_files = $(DEB_DIVERT_FILES_$(package)) $(replace_files)
+debian-divert/%: divert_files = $(DEB_DIVERT_FILES_$(package)) $(DEB_REPLACE_FILES_$(package))
+debian-divert/%: divert_remove_files = $(DEB_REMOVE_FILES_$(package))
+debian-divert/%: divert_undivert_files = $(DEB_UNDIVERT_FILES_$(package))
+debian-divert/%: divert_unremove_files = $(DEB_UNREMOVE_FILES_$(package))
+debian-divert/%: divert_files_all = $(strip $(divert_files) $(divert_remove_files) $(divert_undivert_files) $(divert_unremove_files))
+debian-divert/%: divert_files_thispkg = $(strip $(divert_files) $(divert_remove_files))
 $(patsubst %,debian-divert/%,$(DEB_DIVERT_PACKAGES)) :: debian-divert/%:
        ( \
            sed 's/#PACKAGE#/$(cdbs_curpkg)/g; s/#DEB_DIVERT_EXTENSION#/$(DEB_DIVERT_EXTENSION)/g' $(DEB_DIVERT_SCRIPT); \
-           $(if $(divert_files), \
+           $(if $(divert_files_all), \
                echo 'if [ "$$1" = "configure" ]; then'; \
+               $(foreach file,$(divert_undivert_files), \
+                   $(if $(DEB_UNDIVERT_FILES_VERSION_$(file)),,\
+                       echo "ERROR!  Missing undivert version for $(file)!">&2; exit 1;) \
+                   echo -n "    if [ -n \"\$$2\" ] && dpkg --compare-versions \"\$$2\" '<<' "; \
+                   echo "'$(DEB_UNDIVERT_FILES_VERSION_$(file))'; then"; \
+                   echo "        undivert_unlink $(call divert_files_replace_name,$(file), )"; \
+                   echo "    fi";) \
+               $(foreach file,$(divert_unremove_files), \
+                   $(if $(DEB_UNREMOVE_FILES_VERSION_$(file)),,\
+                       echo "ERROR!  Missing unremove version for $(file)!">&2; exit 1;) \
+                   echo -n "    if [ -n \"\$$2\" ] && dpkg --compare-versions \"\$$2\" '<<' "; \
+                   echo "'$(DEB_UNREMOVE_FILES_VERSION_$(file))'; then"; \
+                   echo "        undivert_unremove $(file)"; \
+                   echo "    fi";) \
                $(foreach file,$(divert_files), \
-                   echo "    divert_link $(subst $(DEB_DIVERT_EXTENSION), ,$(file))";) \
+                   echo "    divert_link $(call divert_files_replace_name,$(file), )";) \
+               $(foreach file,$(divert_remove_files), \
+                   mkdir -p $(DEB_DESTDIR)/usr/share/$(cdbs_curpkg); \
+                   echo "    divert_remove $(file) /usr/share/$(cdbs_curpkg)/`$(DEB_DIVERT_ENCODER) $(file)`";) \
                echo 'fi'; \
            ) \
        ) >> $(CURDIR)/debian/$(cdbs_curpkg).postinst.debhelper
        ( \
            sed 's/#PACKAGE#/$(cdbs_curpkg)/g; s/#DEB_DIVERT_EXTENSION#/$(DEB_DIVERT_EXTENSION)/g' $(DEB_DIVERT_SCRIPT); \
-           $(if $(divert_files), \
+           $(if $(divert_files_thispkg), \
                echo 'if [ "$$1" = "remove" ]; then'; \
                $(foreach file,$(divert_files), \
-                   echo "    undivert_unlink $(subst $(DEB_DIVERT_EXTENSION), ,$(file))";) \
+                   echo "    undivert_unlink $(call divert_files_replace_name,$(file), )";) \
+               $(foreach file,$(divert_remove_files), \
+                   echo "    undivert_unremove $(file) $(cdbs_curpkg)";) \
                echo 'fi'; \
            ) \
        ) >> $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper
        ( \
            echo -n "diverted-files="; \
-           $(foreach file,$(divert_files),\
-               ${DEB_DIVERT_ENCODER} "$(subst $(DEB_DIVERT_EXTENSION),,$(file))"; \
+           $(foreach file,$(divert_files_thispkg),\
+               echo -n "configures-"; \
+               ${DEB_DIVERT_ENCODER} "$(call divert_files_replace_name,$(file))"; \
                echo -n ", ";) \
            echo \
        ) >> $(CURDIR)/debian/$(cdbs_curpkg).substvars