Fix bug where DEB_DIVERT code gets added twice if a package uses both DEB_DIVERT_FILE...

git-svn-id: svn+ssh://svn.mit.edu/athena/trunk/debathena/debathena/config-package-dev@22859 728af825-273c-0410-89f9-f7d3b574a069

diff --git a/debian/changelog b/debian/changelog
index a4f4d062a5261bdf8297c1ee86208cb93837e38b..9f0210f71659cde0a7d603eddd30dc92c1a0e5b9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+config-package-dev (4.3) unstable; urgency=low
+
+  * Fix bug where DEB_DIVERT code gets added twice if a package uses both
+    DEB_DIVERT_FILES and DEB_REPLACE_FILES.
+
+ -- Tim Abbott <tabbott@mit.edu>  Sun,  6 Apr 2008 19:41:45 -0400
+
 config-package-dev (4.2) unstable; urgency=low
 
   * Rename DEB_REPLACE_FILES_SOURCE to DEB_CHECK_FILES_SOURCE, and

diff --git a/divert.mk b/divert.mk
index 229f99903954f2ddc08bb7d205b0281b88c6f795..30fb02e072a92d4d717812d5058fe5f06712e680 100644 (file)
--- a/divert.mk
+++ b/divert.mk
@@ -25,10 +25,8 @@ CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), config-package-dev
 DEB_DIVERT_SCRIPT = /usr/share/config-package-dev/divert.sh.in
 
 DEB_DIVERT_PACKAGES += $(foreach package,$(DEB_ALL_PACKAGES), \
-    $(if $(DEB_DIVERT_FILES_$(package)),$(package)))
-
-DEB_DIVERT_PACKAGES += $(foreach package,$(DEB_ALL_PACKAGES), \
-    $(if $(DEB_REPLACE_FILES_$(package)),$(package)))
+    $(if $(DEB_REPLACE_FILES_$(package)),$(package), \
+    $(if $(DEB_DIVERT_FILES_$(package)),$(package))))
 
 ifeq ($(DEB_DIVERT_EXTENSION),)
 DEB_DIVERT_EXTENSION = .divert