[23302] in Source-Commits
/svn/athena r22961 - in trunk/debathena/debathena/config-package-dev: . debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Mon May 5 16:43:01 2008
Date: Mon, 5 May 2008 16:42:46 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200805052042.QAA20016@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-05-05 16:42:45 -0400 (Mon, 05 May 2008)
New Revision: 22961
Modified:
trunk/debathena/debathena/config-package-dev/debian/changelog
trunk/debathena/debathena/config-package-dev/debian/control
trunk/debathena/debathena/config-package-dev/debian/control.in
trunk/debathena/debathena/config-package-dev/debian/copyright
trunk/debathena/debathena/config-package-dev/divert.mk
trunk/debathena/debathena/config-package-dev/transform-files.mk
Log:
In config-package-dev:
* Move homepage field to source package section, so it works.
* Make DEB_TRANSFROM_FILES targets depend on common-build-arch and
common-build-indep, so it works with architecture-dependent packages.
* Remove useless clean code from transform-files.mk.
* Move divert.mk from binary-fixup to binary-post-install.
* Add debhelper.mk to divert.mk, since we use its
binary-post-install/package target.
* Change maintainer to me, rather than debathena@mit.edu, since I'll be
maintaining config-package-dev in Debian.
* Upload to Debian (Closes: #469107)
Modified: trunk/debathena/debathena/config-package-dev/debian/changelog
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/changelog 2008-05-05 01:56:23 UTC (rev 22960)
+++ trunk/debathena/debathena/config-package-dev/debian/changelog 2008-05-05 20:42:45 UTC (rev 22961)
@@ -1,3 +1,18 @@
+config-package-dev (4.7) unstable; urgency=low
+
+ * Move homepage field to source package section, so it works.
+ * Make DEB_TRANSFROM_FILES targets depend on common-build-arch and
+ common-build-indep, so it works with architecture-dependent packages.
+ * Remove useless clean code from transform-files.mk.
+ * Move divert.mk from binary-fixup to binary-post-install.
+ * Add debhelper.mk to divert.mk, since we use its
+ binary-post-install/package target.
+ * Change maintainer to me, rather than debathena@mit.edu, since I'll be
+ maintaining config-package-dev in Debian.
+ * Upload to Debian (Closes: #469107)
+
+ -- Tim Abbott <tabbott@mit.edu> Sat, 03 May 2008 13:37:12 -0400
+
config-package-dev (4.6) unstable; urgency=low
* Remove DEB_AUTO_UPDATE_DEBIAN_CONTROL so it can be uploaded to Debian.
Modified: trunk/debathena/debathena/config-package-dev/debian/control
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/control 2008-05-05 01:56:23 UTC (rev 22960)
+++ trunk/debathena/debathena/config-package-dev/debian/control 2008-05-05 20:42:45 UTC (rev 22961)
@@ -1,15 +1,14 @@
Source: config-package-dev
Section: devel
Priority: extra
-Maintainer: Debian-Athena Project <debathena@mit.edu>
-Uploaders: Tim Abbott <tabbott@mit.edu>
+Maintainer: Tim Abbott <tabbott@mit.edu>
+Homepage: http://debathena.mit.edu/config-packages/
Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0)
Standards-Version: 3.7.3
Package: config-package-dev
Architecture: all
Depends: cdbs, ${misc:Depends}
-Homepage: http://debathena.mit.edu/config-packages/
Description: CDBS modules for building configuration packages
This package contains a system of CDBS modules for creating Debian
configuration packages: packages that configure an existing Debian
Modified: trunk/debathena/debathena/config-package-dev/debian/control.in
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/control.in 2008-05-05 01:56:23 UTC (rev 22960)
+++ trunk/debathena/debathena/config-package-dev/debian/control.in 2008-05-05 20:42:45 UTC (rev 22961)
@@ -1,15 +1,14 @@
Source: config-package-dev
Section: devel
Priority: extra
-Maintainer: Debian-Athena Project <debathena@mit.edu>
-Uploaders: Tim Abbott <tabbott@mit.edu>
+Maintainer: Tim Abbott <tabbott@mit.edu>
+Homepage: http://debathena.mit.edu/config-packages/
Build-Depends: @cdbs@
Standards-Version: 3.7.3
Package: config-package-dev
Architecture: all
Depends: cdbs, ${misc:Depends}
-Homepage: http://debathena.mit.edu/config-packages/
Description: CDBS modules for building configuration packages
This package contains a system of CDBS modules for creating Debian
configuration packages: packages that configure an existing Debian
Modified: trunk/debathena/debathena/config-package-dev/debian/copyright
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/copyright 2008-05-05 01:56:23 UTC (rev 22960)
+++ trunk/debathena/debathena/config-package-dev/debian/copyright 2008-05-05 20:42:45 UTC (rev 22961)
@@ -1,6 +1,8 @@
Authors: Tim Abbott <tabbott@mit.edu>
Anders Kaseorg <andersk@mit.edu>
+The upstream location for this software is now the Debian archive.
+
Copyright: (C) Tim Abbott and Anders Kaseorg 2006-2008
This program is free software; you can redistribute it and/or modify
Modified: trunk/debathena/debathena/config-package-dev/divert.mk
===================================================================
--- trunk/debathena/debathena/config-package-dev/divert.mk 2008-05-05 01:56:23 UTC (rev 22960)
+++ trunk/debathena/debathena/config-package-dev/divert.mk 2008-05-05 20:42:45 UTC (rev 22961)
@@ -20,6 +20,8 @@
ifndef _cdbs_rules_divert
_cdbs_rules_divert = 1
+include /usr/share/cdbs/1/rules/debhelper.mk
+
CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), config-package-dev (>= 4.5~)
DEB_DIVERT_SCRIPT = /usr/share/config-package-dev/divert.sh.in
@@ -93,6 +95,6 @@
echo \
) >> $(CURDIR)/debian/$(cdbs_curpkg).substvars
-$(patsubst %,binary-fixup/%,$(DEB_DIVERT_PACKAGES)) :: binary-fixup/%: debian-divert/%
+$(patsubst %,binary-post-install/%,$(DEB_DIVERT_PACKAGES)) :: binary-post-install/%: debian-divert/%
endif
Modified: trunk/debathena/debathena/config-package-dev/transform-files.mk
===================================================================
--- trunk/debathena/debathena/config-package-dev/transform-files.mk 2008-05-05 01:56:23 UTC (rev 22960)
+++ trunk/debathena/debathena/config-package-dev/transform-files.mk 2008-05-05 20:42:45 UTC (rev 22961)
@@ -29,7 +29,7 @@
debian_transform_files = $(patsubst %,$(DEB_TRANSFORM_FILES_DIR)%,$(1))
undebian_transform_files = $(patsubst $(DEB_TRANSFORM_FILES_DIR)%,%,$(1))
-common-build-indep:: $(foreach file,$(DEB_TRANSFORM_FILES),$(call debian_transform_files,$(file)))
+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)
@@ -44,7 +44,6 @@
$(DEB_DESTDIR)/$(dir $(file));)
clean::
- $(foreach file,$(DEB_TRANSFORM_FILES),rm -f debian/$(notdir $(file)))
rm -rf $(DEB_TRANSFORM_FILES_DIR)
endif
