Reverse {pre,post}rm maintainer script fragments when DH_COMPAT ≥ 6, not 5

Reported-by: Geoffrey Thomas <geofft@mit.edu>
Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/debconf-divert.mk b/debconf-divert.mk
index 84de2d5139c79e6e4180e2f99688e0e529a67b6a..26f97bf855d462bc8b9e11a203cde6a19f06c7c1 100644 (file)
--- a/debconf-divert.mk
+++ b/debconf-divert.mk
@@ -27,7 +27,7 @@ DEB_DEBCONF_HACK_SCRIPT = /usr/share/config-package-dev/debconf-hack.sh
 DEB_DEBCONF_HACK_PACKAGES += $(foreach package,$(DEB_ALL_PACKAGES), \
     $(if $(wildcard debian/$(package).debconf-hack),$(package)))
 
-dh_compat_5 := $(shell if [ '$(DH_COMPAT)' -ge 5 ]; then echo y; fi)
+dh_compat_6 := $(shell if [ '$(DH_COMPAT)' -ge 6 ]; then echo y; fi)
 
 $(patsubst %,debian-debconf-hack/%,$(DEB_DEBCONF_HACK_PACKAGES)) :: debian-debconf-hack/%:
        set -e; \
@@ -50,7 +50,7 @@ $(patsubst %,debian-debconf-hack/%,$(DEB_DEBCONF_HACK_PACKAGES)) :: debian-debco
        } >> $(CURDIR)/debian/$(cdbs_curpkg).postinst.debhelper
        set -e; \
        { \
-           $(if $(dh_compat_5),, \
+           $(if $(dh_compat_6),, \
                if [ -e $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper ]; then \
                    cat $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper; \
                fi;) \
@@ -59,7 +59,7 @@ $(patsubst %,debian-debconf-hack/%,$(DEB_DEBCONF_HACK_PACKAGES)) :: debian-debco
            echo '    debconf_set </var/cache/$(cdbs_curpkg).debconf-save'; \
            echo '    rm -f /var/cache/$(cdbs_curpkg).debconf-save'; \
            echo 'fi'; \
-           $(if $(dh_compat_5), \
+           $(if $(dh_compat_6), \
                if [ -e $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper ]; then \
                    cat $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper; \
                fi;) \

diff --git a/debian/changelog b/debian/changelog
index eb820b0bf3365704f8fae14a48ae7806b1c4766d..a6143e173ea5f613e735ae3feaa9ebb483d24a71 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+config-package-dev (4.14) UNRELEASED; urgency=low
+
+  * Reverse prerm and postrm maintainer script fragments when DH_COMPAT ≥
+    6, not 5, to actually match debhelper’s behavior.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Mon, 21 May 2012 01:58:27 -0400
+
 config-package-dev (4.13) unstable; urgency=low
 
   * Fix DEB_CHECK_FILES and DEB_TRANSFORM_FILES with non-conffiles in

diff --git a/divert.mk b/divert.mk
index 6212abe3850a677a306cfeeea968117e928445a8..577021d676c399e9286d0af690b4a3b0554d1c5c 100644 (file)
--- a/divert.mk
+++ b/divert.mk
@@ -57,10 +57,10 @@ divert_files_replace_name = $(shell echo $(1) | perl -pe 's/(.*)\Q$(DEB_DIVERT_E
 # removed
 remove_files_name = /usr/share/$(cdbs_curpkg)/$(shell $(DEB_DIVERT_ENCODER) $(1))
 
-dh_compat_5 := $(shell if [ '$(DH_COMPAT)' -ge 5 ]; then echo y; fi)
+dh_compat_6 := $(shell if [ '$(DH_COMPAT)' -ge 6 ]; then echo y; fi)
 
 reverse = $(foreach n,$(shell seq $(words $(1)) -1 1),$(word $(n),$(1)))
-reverse_dh_compat_5 = $(if $(dh_compat_5),$(call reverse,$(1)),$(1))
+reverse_dh_compat_6 = $(if $(dh_compat_6),$(call reverse,$(1)),$(1))
 
 debian-divert/%: package = $(subst debian-divert/,,$@)
 debian-divert/%: divert_files = $(DEB_DIVERT_FILES_$(package)) $(DEB_TRANSFORM_FILES_$(package))
@@ -93,20 +93,20 @@ $(patsubst %,debian-divert/%,$(DEB_DIVERT_PACKAGES)) :: debian-divert/%:
 # Add code to prerm script to undo diversions when package is removed.
        set -e; \
        { \
-           $(if $(dh_compat_5),, \
+           $(if $(dh_compat_6),, \
                if [ -e $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper ]; then \
                    cat $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper; \
                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'; \
-               $(foreach file,$(call reverse_dh_compat_5,$(divert_files)), \
+               $(foreach file,$(call reverse_dh_compat_6,$(divert_files)), \
                    echo "    undivert_unlink $(call divert_files_replace_name,$(file), )";) \
-               $(foreach file,$(call reverse_dh_compat_5,$(divert_remove_files)), \
+               $(foreach file,$(call reverse_dh_compat_6,$(divert_remove_files)), \
                    echo "    undivert_unremove $(file) $(cdbs_curpkg)";) \
                echo 'fi'; \
            ) \
-           $(if $(dh_compat_5), \
+           $(if $(dh_compat_6), \
                if [ -e $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper ]; then \
                    cat $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper; \
                fi;) \