[25531] in Source-Commits
/svn/athena r25061 - in trunk/debathena/debathena/config-package-dev: . debian
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Wed Mar 16 21:51:14 2011
Date: Wed, 16 Mar 2011 21:51:08 -0400
From: Anders Kaseorg <andersk@MIT.EDU>
Message-Id: <201103170151.p2H1p8tC016974@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: andersk
Date: 2011-03-16 21:51:08 -0400 (Wed, 16 Mar 2011)
New Revision: 25061
Modified:
trunk/debathena/debathena/config-package-dev/debconf-divert.mk
trunk/debathena/debathena/config-package-dev/debian/changelog
trunk/debathena/debathena/config-package-dev/divert.mk
Log:
Modified: trunk/debathena/debathena/config-package-dev/debconf-divert.mk
===================================================================
--- trunk/debathena/debathena/config-package-dev/debconf-divert.mk 2011-03-17 01:51:07 UTC (rev 25060)
+++ trunk/debathena/debathena/config-package-dev/debconf-divert.mk 2011-03-17 01:51:08 UTC (rev 25061)
@@ -27,6 +27,8 @@
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)
+
$(patsubst %,debian-debconf-hack/%,$(DEB_DEBCONF_HACK_PACKAGES)) :: debian-debconf-hack/%:
set -e; \
{ \
@@ -48,12 +50,22 @@
} >> $(CURDIR)/debian/$(cdbs_curpkg).postinst.debhelper
set -e; \
{ \
+ $(if $(dh_compat_5),, \
+ if [ -e $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper ]; then \
+ cat $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper; \
+ fi;) \
cat $(DEB_DEBCONF_HACK_SCRIPT); \
echo 'if [ -f /var/cache/$(cdbs_curpkg).debconf-save ]; then'; \
echo ' debconf_set </var/cache/$(cdbs_curpkg).debconf-save'; \
echo ' rm -f /var/cache/$(cdbs_curpkg).debconf-save'; \
echo 'fi'; \
- } >> $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper
+ $(if $(dh_compat_5), \
+ if [ -e $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper ]; then \
+ cat $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper; \
+ fi;) \
+ } >> $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper.new
+ mv $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper.new \
+ $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper
$(patsubst %,binary-fixup/%,$(DEB_DEBCONF_HACK_PACKAGES)) :: binary-fixup/%: debian-debconf-hack/%
Modified: trunk/debathena/debathena/config-package-dev/debian/changelog
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/changelog 2011-03-17 01:51:07 UTC (rev 25060)
+++ trunk/debathena/debathena/config-package-dev/debian/changelog 2011-03-17 01:51:08 UTC (rev 25061)
@@ -13,8 +13,10 @@
* Remove DEB_UNDIVERT_VERSION_file and DEB_UNREMOVE_VERSION_file, and
instead test for the undiverted file in the postinst. (Patch from
Evan Broder.)
+ * Write the prerm and postrm maintainer script fragments in reverse
+ order when DH_COMPAT ≥ 5, to match debhelper’s behavior.
- -- Anders Kaseorg <andersk@mit.edu> Sat, 06 Nov 2010 19:02:52 -0400
+ -- Anders Kaseorg <andersk@mit.edu> Sat, 05 Feb 2011 21:21:59 -0500
config-package-dev (4.11) unstable; urgency=low
Modified: trunk/debathena/debathena/config-package-dev/divert.mk
===================================================================
--- trunk/debathena/debathena/config-package-dev/divert.mk 2011-03-17 01:51:07 UTC (rev 25060)
+++ trunk/debathena/debathena/config-package-dev/divert.mk 2011-03-17 01:51:08 UTC (rev 25061)
@@ -57,6 +57,11 @@
# 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)
+
+reverse = $(foreach n,$(shell seq $(words $(1)) -1 1),$(word $(n),$(1)))
+reverse_dh_compat_5 = $(if $(dh_compat_5),$(call reverse,$(1)),$(1))
+
debian-divert/%: package = $(subst debian-divert/,,$@)
debian-divert/%: divert_files = $(DEB_DIVERT_FILES_$(package)) $(DEB_TRANSFORM_FILES_$(package))
debian-divert/%: divert_remove_files = $(DEB_REMOVE_FILES_$(package))
@@ -88,16 +93,26 @@
# Add code to prerm script to undo diversions when package is removed.
set -e; \
{ \
+ $(if $(dh_compat_5),, \
+ 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,$(divert_files), \
+ $(foreach file,$(call reverse_dh_compat_5,$(divert_files)), \
echo " undivert_unlink $(call divert_files_replace_name,$(file), )";) \
- $(foreach file,$(divert_remove_files), \
+ $(foreach file,$(call reverse_dh_compat_5,$(divert_remove_files)), \
echo " undivert_unremove $(file) $(cdbs_curpkg)";) \
echo 'fi'; \
) \
- } >> $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper
+ $(if $(dh_compat_5), \
+ if [ -e $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper ]; then \
+ cat $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper; \
+ fi;) \
+ } >> $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper.new
+ mv $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper.new \
+ $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper
# Add an encoding of the names of the diverted files to the Provides:
# and Conflicts: lists. This prevents two packages diverting the same
# file from being installed simultaneously (it cannot work, and this
