[23195] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r22856 - trunk/debathena/config/autofs-config/debian

daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 18:59:53 2008

Date: Sun, 6 Apr 2008 18:59:18 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804062259.SAA01638@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: tabbott
Date: 2008-04-06 18:59:16 -0400 (Sun, 06 Apr 2008)
New Revision: 22856

Modified:
   trunk/debathena/config/autofs-config/debian/changelog
   trunk/debathena/config/autofs-config/debian/control
   trunk/debathena/config/autofs-config/debian/control.in
   trunk/debathena/config/autofs-config/debian/rules
Log:


Modified: trunk/debathena/config/autofs-config/debian/changelog
===================================================================
--- trunk/debathena/config/autofs-config/debian/changelog	2008-04-06 22:55:24 UTC (rev 22855)
+++ trunk/debathena/config/autofs-config/debian/changelog	2008-04-06 22:59:16 UTC (rev 22856)
@@ -1,3 +1,9 @@
+debathena-autofs-config (1.4) unstable; urgency=low
+
+  * Convert rules and control files to new config-package-dev interface.
+
+ -- Michael Y McCanna <acrefoot@mit.edu>  Sun,  6 Apr 2008 16:22:51 -0400
+
 debathena-autofs-config (1.3) unstable; urgency=low
 
   * Don't run our the stop command in our init script on package removal.

Modified: trunk/debathena/config/autofs-config/debian/control
===================================================================
--- trunk/debathena/config/autofs-config/debian/control	2008-04-06 22:55:24 UTC (rev 22855)
+++ trunk/debathena/config/autofs-config/debian/control	2008-04-06 22:59:16 UTC (rev 22856)
@@ -2,12 +2,14 @@
 Section: debathena-config/net
 Priority: extra
 Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), debathena-config-build-common (>= 3.7~)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev
 Standards-Version: 3.7.2
 
 Package: debathena-autofs-config
 Architecture: all
 Depends: autofs-hesiod, debathena-afs-config, debathena-hesiod-config, ${misc:Depends}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: Automounter configuration for Debian-Athena
  This packages configures autofs to automatically mount Athena lockers
  using the Hesiod directory information.  It also configures autofs to

Modified: trunk/debathena/config/autofs-config/debian/control.in
===================================================================
--- trunk/debathena/config/autofs-config/debian/control.in	2008-04-06 22:55:24 UTC (rev 22855)
+++ trunk/debathena/config/autofs-config/debian/control.in	2008-04-06 22:59:16 UTC (rev 22856)
@@ -8,6 +8,8 @@
 Package: debathena-autofs-config
 Architecture: all
 Depends: autofs-hesiod, debathena-afs-config, debathena-hesiod-config, ${misc:Depends}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
 Description: Automounter configuration for Debian-Athena
  This packages configures autofs to automatically mount Athena lockers
  using the Hesiod directory information.  It also configures autofs to

Modified: trunk/debathena/config/autofs-config/debian/rules
===================================================================
--- trunk/debathena/config/autofs-config/debian/rules	2008-04-06 22:55:24 UTC (rev 22855)
+++ trunk/debathena/config/autofs-config/debian/rules	2008-04-06 22:59:16 UTC (rev 22856)
@@ -1,9 +1,10 @@
 #!/usr/bin/make -f
 
 DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-autofs-config += \
+DEB_DIVERT_EXTENSION = .debathena
+DEB_DIVERT_FILES_debathena-autofs-config += \
 	/etc/auto.master.debathena
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/debathena-divert.mk
+include /usr/share/cdbs/1/rules/replace-files.mk
 DEB_UPDATE_RCD_PARAMS = "defaults 26 17"
 DEB_DH_INSTALLINIT_ARGS = "--no-start"


home help back first fref pref prev next nref lref last post