* Rename DEB_REPLACE_FILES to DEB_TRANSFORM_FILES

[config-package-dev.git] / divert.mk

diff --git a/divert.mk b/divert.mk
index bab17704484ce254f73d8e3dd5473b8e82d5ddaf..60729e5cb3a319bbf098005cf75194f96cba03af 100644 (file)
--- a/divert.mk
+++ b/divert.mk
@@ -20,12 +20,12 @@
 ifndef _cdbs_rules_divert
 _cdbs_rules_divert = 1
 
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), config-package-dev (>= 4.4)
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), config-package-dev (>= 4.5~)
 
 DEB_DIVERT_SCRIPT = /usr/share/config-package-dev/divert.sh.in
 
 DEB_DIVERT_PACKAGES += $(foreach package,$(DEB_ALL_PACKAGES), \
-    $(if $(DEB_REPLACE_FILES_$(package)),$(package), \
+    $(if $(DEB_TRANSFORM_FILES_$(package)),$(package), \
     $(if $(DEB_REMOVE_FILES_$(package)),$(package), \
     $(if $(DEB_UNREMOVE_FILES_$(package)),$(package), \
     $(if $(DEB_UNDIVERT_FILES_$(package)),$(package), \
@@ -40,7 +40,7 @@ DEB_DIVERT_ENCODER = /usr/share/config-package-dev/encode
 divert_files_replace_name = $(shell echo $(1) | perl -pe 's/(.*)\Q$(DEB_DIVERT_EXTENSION)\E/$$1$(2)/')
 
 debian-divert/%: package = $(subst debian-divert/,,$@)
-debian-divert/%: divert_files = $(DEB_DIVERT_FILES_$(package)) $(DEB_REPLACE_FILES_$(package))
+debian-divert/%: divert_files = $(DEB_DIVERT_FILES_$(package)) $(DEB_TRANSFORM_FILES_$(package))
 debian-divert/%: divert_remove_files = $(DEB_REMOVE_FILES_$(package))
 debian-divert/%: divert_undivert_files = $(DEB_UNDIVERT_FILES_$(package))
 debian-divert/%: divert_unremove_files = $(DEB_UNREMOVE_FILES_$(package))
@@ -52,17 +52,17 @@ $(patsubst %,debian-divert/%,$(DEB_DIVERT_PACKAGES)) :: debian-divert/%:
            $(if $(divert_files_all), \
                echo 'if [ "$$1" = "configure" ]; then'; \
                $(foreach file,$(divert_undivert_files), \
-                   $(if $(DEB_UNDIVERT_FILES_VERSION_$(file)),,\
+                   $(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_FILES_VERSION_$(file))'; then"; \
+                   echo "'$(DEB_UNDIVERT_VERSION_$(file))'; then"; \
                    echo "        undivert_unlink $(call divert_files_replace_name,$(file), )"; \
                    echo "    fi";) \
                $(foreach file,$(divert_unremove_files), \
-                   $(if $(DEB_UNREMOVE_FILES_VERSION_$(file)),,\
+                   $(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_FILES_VERSION_$(file))'; then"; \
+                   echo "'$(DEB_UNREMOVE_VERSION_$(file))'; then"; \
                    echo "        undivert_unremove $(file)"; \
                    echo "    fi";) \
                $(foreach file,$(divert_files), \