From 208027825066a2e8a61dbf9c81724e5f3d4bf409 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sun, 9 May 2010 18:19:25 +0000 Subject: [PATCH] * Allow specifying DEB_TRANSFORM_SCRIPT_$package_$file in case you want multiple binary packages transforming the same file differently. (Thanks to Evan Broder for this patch). * Add a decode script for undoing the file to virtual package name transformation. (Thanks to Patrick Hurst for writing decode). git-svn-id: svn+ssh://svn.mit.edu/athena/trunk/debathena/debathena/config-package-dev@24646 728af825-273c-0410-89f9-f7d3b574a069 --- debian/changelog | 10 ++++++++++ debian/config-package-dev.install | 1 + transform-files.mk | 8 +++++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 90d9093..e11d49f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +config-package-dev (4.12) unstable; urgency=low + + * Allow specifying DEB_TRANSFORM_SCRIPT_$package_$file in case you want + multiple binary packages transforming the same file differently. + (Thanks to Evan Broder for this patch). + * Add a decode script for undoing the file to virtual package name + transformation. (Thanks to Patrick Hurst for writing decode). + + -- Tim Abbott Sun, 09 May 2010 14:14:50 -0400 + config-package-dev (4.11) unstable; urgency=low * Fix marking transform scripts as executable when diff --git a/debian/config-package-dev.install b/debian/config-package-dev.install index 111f6b3..abd926b 100644 --- a/debian/config-package-dev.install +++ b/debian/config-package-dev.install @@ -4,5 +4,6 @@ check-files.mk usr/share/cdbs/1/rules/ config-package.mk usr/share/cdbs/1/rules/ transform-files.mk usr/share/cdbs/1/rules/ encode usr/share/config-package-dev/ +decode usr/share/config-package-dev/ divert.sh.in usr/share/config-package-dev/ debconf-hack.sh usr/share/config-package-dev/ diff --git a/transform-files.mk b/transform-files.mk index 5c500b6..c75e861 100644 --- a/transform-files.mk +++ b/transform-files.mk @@ -31,9 +31,11 @@ DEB_TRANSFORM_FILES_TMPDIR=debian/transform_file_copies debian_transform_files = $(patsubst %,$(DEB_TRANSFORM_FILES_TMPDIR)%,$(1)) undebian_transform_files = $(patsubst $(DEB_TRANSFORM_FILES_TMPDIR)%,%,$(1)) -debian_transform_script = $(if $(DEB_TRANSFORM_SCRIPT_$(call undebian_transform_files,$(1))), \ - $(DEB_TRANSFORM_SCRIPT_$(call undebian_transform_files,$(1))), \ - debian/transform_$(notdir $(call undebian_transform_files,$(1)))) +debian_transform_script = $(if $(DEB_TRANSFORM_SCRIPT_$(cdbs_curpkg)_$(call undebian_transform_files,$(1))), \ + $(DEB_TRANSFORM_SCRIPT_$(cdbs_curpkg)_$(call undebian_transform_files,$(1))), \ + $(if $(DEB_TRANSFORM_SCRIPT_$(call undebian_transform_files,$(1))), \ + $(DEB_TRANSFORM_SCRIPT_$(call undebian_transform_files,$(1))), \ + debian/transform_$(notdir $(call undebian_transform_files,$(1))))) common-build-arch common-build-indep:: $(foreach file,$(DEB_TRANSFORM_FILES),$(call debian_transform_files,$(file))) -- 2.45.0