Release config-package-dev 4.14, and update maintainer and uploaders.

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

diff --git a/divert.mk b/divert.mk
index d352554f540a61ced32f6ea13f2ee640228cd897..9ad61caf12ccf17007b60949d367c130ab5da440 100644 (file)
--- a/divert.mk
+++ b/divert.mk
@@ -21,7 +21,9 @@
 # config-package.mk.
 
 # divert.mk handles the low-level diversion logic.  It includes
-# divert.sh.in in the postinst and prerm scripts, and adds 
+# divert.sh.in in the postinst and prerm scripts, and adds calls to the
+# functions in divert.sh.in to add and remove diversions and symlinks at
+# the appropriate points.
 
 ifndef _cdbs_rules_divert
 _cdbs_rules_divert = 1
@@ -99,7 +101,7 @@ $(patsubst %,debian-divert/%,$(DEB_DIVERT_PACKAGES)) :: debian-divert/%:
                fi;) \
            sed 's/#PACKAGE#/$(cdbs_curpkg)/g; s/#DEB_DIVERT_EXTENSION#/$(DEB_DIVERT_EXTENSION)/g' $(DEB_DIVERT_SCRIPT); \
            $(if $(divert_files_thispkg), \
-               echo 'if [ "$$1" = "remove" ]; then'; \
+               echo 'if [ "$$1" = "remove" ] || [ "$$1" = "deconfigure" ]; then'; \
                $(foreach file,$(call reverse_dh_compat_6,$(divert_files)), \
                    echo "    undivert_unlink $(call divert_files_replace_name,$(file), )";) \
                $(foreach file,$(call reverse_dh_compat_6,$(divert_remove_files)), \