* 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)

git-svn-id: svn+ssh://svn.mit.edu/athena/trunk/debathena/debathena/config-package-dev@22961 728af825-273c-0410-89f9-f7d3b574a069

diff --git a/debian/changelog b/debian/changelog
index f1a7461888de0f47f353862f7bdaad7bc3a36dd2..4821a39ac1b50751da9f9b53091aa2d87598882c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.

diff --git a/debian/control b/debian/control
index f50c0fb4f394b040a97e01c826a5fb4abaadf915..e99a252e0e5ab6898d4d36b5f8250e0917b0f86b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -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

diff --git a/debian/control.in b/debian/control.in
index 9fc0788220a3ae31618c73bd260f1021fe70dfc0..705974e4eb651dbd7ba63e6e19bf4579ecc266ea 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -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

diff --git a/debian/copyright b/debian/copyright
index 5cd24baf7d8d8ecf6768d3fadce7dee5d8e91dcc..2915f5e3b669486ff9692c116589e9f06ef53caa 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -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

diff --git a/divert.mk b/divert.mk
index 60729e5cb3a319bbf098005cf75194f96cba03af..5b90efeb844e38f964133b027237a8baee2f1393 100644 (file)
--- a/divert.mk
+++ b/divert.mk
@@ -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 @@ $(patsubst %,debian-divert/%,$(DEB_DIVERT_PACKAGES)) :: debian-divert/%:
            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

diff --git a/transform-files.mk b/transform-files.mk
index 48e0fc03d434e64f1e8f46c0d7cac80a2e3ad826..43ab6c02a6146a01797b932d77f8de5614612e76 100644 (file)
--- a/transform-files.mk
+++ b/transform-files.mk
@@ -29,7 +29,7 @@ DEB_TRANSFORM_FILES_DIR=debian/transform_file_copies
 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 @@ $(patsubst %,binary-install/%,$(DEB_ALL_PACKAGES)) :: binary-install/%:
                    $(DEB_DESTDIR)/$(dir $(file));)
 
 clean::
-       $(foreach file,$(DEB_TRANSFORM_FILES),rm -f debian/$(notdir $(file)))
        rm -rf $(DEB_TRANSFORM_FILES_DIR)
 
 endif