X-Git-Url: http://andersk.mit.edu/gitweb/config-package-dev.git/blobdiff_plain/669ac158fbf20177bc2ae567bdc4a08bab0fc467..9350e9766b5a36e42b58140f18add1f6bab6b49c:/divert.mk diff --git a/divert.mk b/divert.mk index 6212abe..577021d 100644 --- 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;) \