From c5ca58a58965a4e7f0bfbdc32c4bf4991a40f015 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sun, 6 Apr 2008 23:42:25 +0000 Subject: [PATCH] Fix bug where DEB_DIVERT code gets added twice if a package uses both DEB_DIVERT_FILES and DEB_REPLACE_FILES. git-svn-id: svn+ssh://svn.mit.edu/athena/trunk/debathena/debathena/config-package-dev@22859 728af825-273c-0410-89f9-f7d3b574a069 --- debian/changelog | 7 +++++++ divert.mk | 6 ++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a4f4d06..9f0210f 100644 --- 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 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 229f999..30fb02e 100644 --- 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 -- 2.45.0