[23261] in Source-Commits
/svn/athena r22923 - in trunk/debathena/debathena/config-package-dev: . debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Mon Apr 21 19:31:35 2008
Date: Mon, 21 Apr 2008 19:30:57 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804212330.TAA17241@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-04-21 19:30:56 -0400 (Mon, 21 Apr 2008)
New Revision: 22923
Added:
trunk/debathena/debathena/config-package-dev/config-package.mk
trunk/debathena/debathena/config-package-dev/transform-files.mk
Removed:
trunk/debathena/debathena/config-package-dev/replace-files.mk
Modified:
trunk/debathena/debathena/config-package-dev/debian/changelog
trunk/debathena/debathena/config-package-dev/debian/config-package-dev.install
trunk/debathena/debathena/config-package-dev/divert.mk
Log:
In config-package-dev:
* Rename DEB_REPLACE_FILES to DEB_TRANSFORM_FILES
* Create new config-package.mk as the outward-facing makefile fragment.
* Replace DEB_{UNREMOVE,UNDIVERT}_FILES_VERSION_file with
DEB_$1_VERSION_file
* Version bump, since 4.4~ << 4.4 causes build failures on Debathena.
Added: trunk/debathena/debathena/config-package-dev/config-package.mk
Modified: trunk/debathena/debathena/config-package-dev/debian/changelog
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/changelog 2008-04-21 23:30:18 UTC (rev 22922)
+++ trunk/debathena/debathena/config-package-dev/debian/changelog 2008-04-21 23:30:56 UTC (rev 22923)
@@ -1,3 +1,18 @@
+config-package-dev (4.5) unstable; urgency=low
+
+ * Rename DEB_REPLACE_FILES to DEB_TRANSFORM_FILES
+ * Create new config-package.mk as the outward-facing makefile fragment.
+ * Replace DEB_{UNREMOVE,UNDIVERT}_FILES_VERSION_file with
+ DEB_$1_VERSION_file
+
+ -- Tim Abbott <tabbott@mit.edu> Mon, 21 Apr 2008 18:39:40 -0400
+
+config-package-dev (4.4.1) unstable; urgency=low
+
+ * Version bump, since 4.4~ << 4.4 causes build failures on Debathena.
+
+ -- Tim Abbott <tabbott@mit.edu> Mon, 21 Apr 2008 17:51:02 -0400
+
config-package-dev (4.4) unstable; urgency=low
* Add new DEB_REMOVE_FILES_$package variable designed for removing
Modified: trunk/debathena/debathena/config-package-dev/debian/config-package-dev.install
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/config-package-dev.install 2008-04-21 23:30:18 UTC (rev 22922)
+++ trunk/debathena/debathena/config-package-dev/debian/config-package-dev.install 2008-04-21 23:30:56 UTC (rev 22923)
@@ -1,7 +1,8 @@
divert.mk usr/share/cdbs/1/rules/
debconf-divert.mk usr/share/cdbs/1/rules/
check-files.mk usr/share/cdbs/1/rules/
-replace-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/
divert.sh.in usr/share/config-package-dev/
debconf-hack.sh usr/share/config-package-dev/
Modified: trunk/debathena/debathena/config-package-dev/divert.mk
===================================================================
--- trunk/debathena/debathena/config-package-dev/divert.mk 2008-04-21 23:30:18 UTC (rev 22922)
+++ trunk/debathena/debathena/config-package-dev/divert.mk 2008-04-21 23:30:56 UTC (rev 22923)
@@ -20,12 +20,12 @@
ifndef _cdbs_rules_divert
_cdbs_rules_divert = 1
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), config-package-dev (>= 4.4)
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), config-package-dev (>= 4.5~)
DEB_DIVERT_SCRIPT = /usr/share/config-package-dev/divert.sh.in
DEB_DIVERT_PACKAGES += $(foreach package,$(DEB_ALL_PACKAGES), \
- $(if $(DEB_REPLACE_FILES_$(package)),$(package), \
+ $(if $(DEB_TRANSFORM_FILES_$(package)),$(package), \
$(if $(DEB_REMOVE_FILES_$(package)),$(package), \
$(if $(DEB_UNREMOVE_FILES_$(package)),$(package), \
$(if $(DEB_UNDIVERT_FILES_$(package)),$(package), \
@@ -40,7 +40,7 @@
divert_files_replace_name = $(shell echo $(1) | perl -pe 's/(.*)\Q$(DEB_DIVERT_EXTENSION)\E/$$1$(2)/')
debian-divert/%: package = $(subst debian-divert/,,$@)
-debian-divert/%: divert_files = $(DEB_DIVERT_FILES_$(package)) $(DEB_REPLACE_FILES_$(package))
+debian-divert/%: divert_files = $(DEB_DIVERT_FILES_$(package)) $(DEB_TRANSFORM_FILES_$(package))
debian-divert/%: divert_remove_files = $(DEB_REMOVE_FILES_$(package))
debian-divert/%: divert_undivert_files = $(DEB_UNDIVERT_FILES_$(package))
debian-divert/%: divert_unremove_files = $(DEB_UNREMOVE_FILES_$(package))
@@ -52,17 +52,17 @@
$(if $(divert_files_all), \
echo 'if [ "$$1" = "configure" ]; then'; \
$(foreach file,$(divert_undivert_files), \
- $(if $(DEB_UNDIVERT_FILES_VERSION_$(file)),,\
+ $(if $(DEB_UNDIVERT_VERSION_$(file)),,\
echo "ERROR! Missing undivert version for $(file)!">&2; exit 1;) \
echo -n " if [ -n \"\$$2\" ] && dpkg --compare-versions \"\$$2\" '<<' "; \
- echo "'$(DEB_UNDIVERT_FILES_VERSION_$(file))'; then"; \
+ echo "'$(DEB_UNDIVERT_VERSION_$(file))'; then"; \
echo " undivert_unlink $(call divert_files_replace_name,$(file), )"; \
echo " fi";) \
$(foreach file,$(divert_unremove_files), \
- $(if $(DEB_UNREMOVE_FILES_VERSION_$(file)),,\
+ $(if $(DEB_UNREMOVE_VERSION_$(file)),,\
echo "ERROR! Missing unremove version for $(file)!">&2; exit 1;) \
echo -n " if [ -n \"\$$2\" ] && dpkg --compare-versions \"\$$2\" '<<' "; \
- echo "'$(DEB_UNREMOVE_FILES_VERSION_$(file))'; then"; \
+ echo "'$(DEB_UNREMOVE_VERSION_$(file))'; then"; \
echo " undivert_unremove $(file)"; \
echo " fi";) \
$(foreach file,$(divert_files), \
Deleted: trunk/debathena/debathena/config-package-dev/replace-files.mk
Copied: trunk/debathena/debathena/config-package-dev/transform-files.mk (from rev 22918, trunk/debathena/debathena/config-package-dev/replace-files.mk)
