[24398] in Source-Commits
/svn/athena r23993 - in trunk/debathena/debathena/config-package-dev: . debian
daemon@ATHENA.MIT.EDU (Timothy G Abbott)
Sat Sep 5 11:48:32 2009
Date: Sat, 5 Sep 2009 11:48:19 -0400
From: Timothy G Abbott <tabbott@MIT.EDU>
Message-Id: <200909051548.n85FmJqA030745@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2009-09-05 11:48:19 -0400 (Sat, 05 Sep 2009)
New Revision: 23993
Modified:
trunk/debathena/debathena/config-package-dev/debian/changelog
trunk/debathena/debathena/config-package-dev/transform-files.mk
Log:
In config-package-dev:
* Fix marking transform scripts as executable when
DEB_TRANSFORM_SCRIPT_package is used.
Modified: trunk/debathena/debathena/config-package-dev/debian/changelog
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/changelog 2009-09-04 18:53:06 UTC (rev 23992)
+++ trunk/debathena/debathena/config-package-dev/debian/changelog 2009-09-05 15:48:19 UTC (rev 23993)
@@ -1,3 +1,10 @@
+config-package-dev (4.11) unstable; urgency=low
+
+ * Fix marking transform scripts as executable when
+ DEB_TRANSFORM_SCRIPT_package is used.
+
+ -- Tim Abbott <tabbott@mit.edu> Sat, 05 Sep 2009 11:46:54 -0400
+
config-package-dev (4.10) unstable; urgency=low
* Mark transform scripts as executable before attempting to execute them
Modified: trunk/debathena/debathena/config-package-dev/transform-files.mk
===================================================================
--- trunk/debathena/debathena/config-package-dev/transform-files.mk 2009-09-04 18:53:06 UTC (rev 23992)
+++ trunk/debathena/debathena/config-package-dev/transform-files.mk 2009-09-05 15:48:19 UTC (rev 23993)
@@ -31,15 +31,16 @@
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))))
common-build-arch common-build-indep:: $(foreach file,$(DEB_TRANSFORM_FILES),$(call debian_transform_files,$(file)))
$(call debian_transform_files,%): $(call debian_check_files,%)
mkdir -p $(@D)
- chmod +x debian/transform_$(notdir $(call undebian_transform_files,$@))
- $(if $(DEB_TRANSFORM_SCRIPT_$(call undebian_transform_files,$@)), \
- $(DEB_TRANSFORM_SCRIPT_$(call undebian_transform_files,$@)), \
- debian/transform_$(notdir $(call undebian_transform_files,$@))) < $< > $@
+ chmod +x $(call debian_transform_script,$@)
+ $(call debian_transform_script,$@) < $< > $@
$(patsubst %,binary-install/%,$(DEB_ALL_PACKAGES)) :: binary-install/%:
set -e; \
