[23198] in Source-Commits
/svn/athena r22859 - in trunk/debathena/debathena/config-package-dev: . debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 19:42:46 2008
Date: Sun, 6 Apr 2008 19:42:32 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804062342.TAA03062@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-04-06 19:42:25 -0400 (Sun, 06 Apr 2008)
New Revision: 22859
Modified:
trunk/debathena/debathena/config-package-dev/debian/changelog
trunk/debathena/debathena/config-package-dev/divert.mk
Log:
Modified: trunk/debathena/debathena/config-package-dev/debian/changelog
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/changelog 2008-04-06 23:32:26 UTC (rev 22858)
+++ trunk/debathena/debathena/config-package-dev/debian/changelog 2008-04-06 23:42:25 UTC (rev 22859)
@@ -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
Modified: trunk/debathena/debathena/config-package-dev/divert.mk
===================================================================
--- trunk/debathena/debathena/config-package-dev/divert.mk 2008-04-06 23:32:26 UTC (rev 22858)
+++ trunk/debathena/debathena/config-package-dev/divert.mk 2008-04-06 23:42:25 UTC (rev 22859)
@@ -25,11 +25,9 @@
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)))
+ $(if $(DEB_REPLACE_FILES_$(package)),$(package), \
+ $(if $(DEB_DIVERT_FILES_$(package)),$(package))))
-DEB_DIVERT_PACKAGES += $(foreach package,$(DEB_ALL_PACKAGES), \
- $(if $(DEB_REPLACE_FILES_$(package)),$(package)))
-
ifeq ($(DEB_DIVERT_EXTENSION),)
DEB_DIVERT_EXTENSION = .divert
endif
