# foo.divert.divert-orig
divert_files_replace_name = $(shell echo $(1) | perl -pe 's/(.*)\Q$(DEB_DIVERT_EXTENSION)\E/$$1$(2)/')
+# Encode a full path into the path it should be diverted to if it's
+# removed
+remove_files_name = /usr/share/$(cdbs_curpkg)/$(shell $(DEB_DIVERT_ENCODER) $(1))
+
+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_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))
debian-divert/%: divert_remove_files = $(DEB_REMOVE_FILES_$(package))
$(if $(divert_files_all), \
echo 'if [ "$$1" = "configure" ]; then'; \
$(foreach file,$(divert_undivert_files), \
- $(if $(DEB_UNDIVERT_VERSION_$(file)),,\
- echo "ERROR! Missing undivert version for $(file)!">&2; exit 1;) \
- echo -n " if [ -n \"\$$2\" ] && dpkg --compare-versions \"\$$2\" '<<' "; \
- echo "'$(DEB_UNDIVERT_VERSION_$(file))'; then"; \
- echo " undivert_unlink $(call divert_files_replace_name,$(file), )"; \
- echo " fi";) \
+ echo " check_undivert_unlink $(call divert_files_replace_name,$(file), )"; )\
$(foreach file,$(divert_unremove_files), \
- $(if $(DEB_UNREMOVE_VERSION_$(file)),,\
- echo "ERROR! Missing unremove version for $(file)!">&2; exit 1;) \
- echo -n " if [ -n \"\$$2\" ] && dpkg --compare-versions \"\$$2\" '<<' "; \
- echo "'$(DEB_UNREMOVE_VERSION_$(file))'; then"; \
- echo " undivert_unremove $(file)"; \
- echo " fi";) \
+ echo " check_undivert_unremove $(file) $(call remove_files_name,$(file))"; )\
$(foreach file,$(divert_files), \
echo " divert_link $(call divert_files_replace_name,$(file), )";) \
$(foreach file,$(divert_remove_files), \
mkdir -p debian/$(cdbs_curpkg)/usr/share/$(cdbs_curpkg); \
- echo " divert_remove $(file) /usr/share/$(cdbs_curpkg)/`$(DEB_DIVERT_ENCODER) $(file)`";) \
+ echo " divert_remove $(file) $(call remove_files_name,$(file))";) \
echo 'fi'; \
) \
} >> $(CURDIR)/debian/$(cdbs_curpkg).postinst.debhelper
# Add code to prerm script to undo diversions when package is removed.
set -e; \
{ \
+ $(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,$(divert_files), \
+ $(foreach file,$(call reverse_dh_compat_6,$(divert_files)), \
echo " undivert_unlink $(call divert_files_replace_name,$(file), )";) \
- $(foreach file,$(divert_remove_files), \
+ $(foreach file,$(call reverse_dh_compat_6,$(divert_remove_files)), \
echo " undivert_unremove $(file) $(cdbs_curpkg)";) \
echo 'fi'; \
) \
- } >> $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper
+ $(if $(dh_compat_6), \
+ 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
# produces a much less ugly error). Requires in debian/control:
-# Provides: $(diverted-files)
-# Conflicts: $(diverted-files)
+# Provides: ${diverted-files}
+# Conflicts: ${diverted-files}
set -e; \
{ \
echo -n "diverted-files="; \