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; \
} >> $(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;) \
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;) \
+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
# 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))
# 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;) \