[23196] in Source-Commits
/svn/athena r22857 - trunk/debathena/config/afs-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 19:00:49 2008
Date: Sun, 6 Apr 2008 19:00:16 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804062300.TAA01662@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 19:00:12 -0400 (Sun, 06 Apr 2008)
New Revision: 22857
Modified:
trunk/debathena/config/afs-config/debian/changelog
trunk/debathena/config/afs-config/debian/control
trunk/debathena/config/afs-config/debian/control.in
trunk/debathena/config/afs-config/debian/rules
Log:
Modified: trunk/debathena/config/afs-config/debian/changelog
===================================================================
--- trunk/debathena/config/afs-config/debian/changelog 2008-04-06 22:59:16 UTC (rev 22856)
+++ trunk/debathena/config/afs-config/debian/changelog 2008-04-06 23:00:12 UTC (rev 22857)
@@ -1,3 +1,9 @@
+debathena-afs-config (1.2debathena5) unstable; urgency=low
+
+ * Changed rules and control files to use new config-package-dev interface.
+
+ -- Michael Y McCanna <acrefoot@mit.edu> Sun, 6 Apr 2008 17:35:49 -0400
+
debathena-afs-config (1.2debathena4) unstable; urgency=low
* Use new debathena-replace-conffiles system.
Modified: trunk/debathena/config/afs-config/debian/control
===================================================================
--- trunk/debathena/config/afs-config/debian/control 2008-04-06 22:59:16 UTC (rev 22856)
+++ trunk/debathena/config/afs-config/debian/control 2008-04-06 23:00:12 UTC (rev 22857)
@@ -2,14 +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.5~), debathena-config-build-common, debathena-config-build-common (>= 3.6~), wget, openafs-client
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev, wget, openafs-client
Standards-Version: 3.7.2
Package: debathena-afs-config
Architecture: all
Depends: openafs-client, debathena-kerberos-config, debathena-machtype, openafs-krb5, ${misc:Depends}
Recommends: debathena-autofs-config
-Provides: ${divert:Diverted}
-Conflicts: ${divert:Diverted}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: AFS configuration for Debian-Athena
This packages configures OpenAFS to access the Athena AFS cell.
Modified: trunk/debathena/config/afs-config/debian/control.in
===================================================================
--- trunk/debathena/config/afs-config/debian/control.in 2008-04-06 22:59:16 UTC (rev 22856)
+++ trunk/debathena/config/afs-config/debian/control.in 2008-04-06 23:00:12 UTC (rev 22857)
@@ -9,7 +9,7 @@
Architecture: all
Depends: openafs-client, debathena-kerberos-config, debathena-machtype, openafs-krb5, ${misc:Depends}
Recommends: debathena-autofs-config
-Provides: ${divert:Diverted}
-Conflicts: ${divert:Diverted}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: AFS configuration for Debian-Athena
This packages configures OpenAFS to access the Athena AFS cell.
Modified: trunk/debathena/config/afs-config/debian/rules
===================================================================
--- trunk/debathena/config/afs-config/debian/rules 2008-04-06 22:59:16 UTC (rev 22856)
+++ trunk/debathena/config/afs-config/debian/rules 2008-04-06 23:00:12 UTC (rev 22857)
@@ -1,17 +1,18 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-afs-config += \
+DEB_DIVERT_EXTENSION = .debathena
+DEB_DIVERT_FILES_debathena-afs-config += \
/etc/openafs/afs.conf.client.debathena \
/etc/openafs/CellAlias.debathena \
/etc/openafs/CellServDB.debathena \
/etc/openafs/SuidCells.debathena \
/etc/openafs/ThisCell.debathena \
/etc/openafs/cacheinfo.debathena
-DEBATHENA_REPLACE_CONFFILES_debathena-afs-config += \
+DEB_REPLACE_FILES_debathena-afs-config += \
/etc/openafs/afs.conf.debathena
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/debathena-replace-conffiles.mk
+include /usr/share/cdbs/1/rules/replace-files.mk
FROM_ATHENA = debian/CellAlias.debathena debian/CellServDB.debathena
