[23219] in Source-Commits
/svn/athena r22880 - trunk/debathena/config/zephyr-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 22:28:43 2008
Date: Sun, 6 Apr 2008 22:28:11 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804070228.WAA05192@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 22:28:10 -0400 (Sun, 06 Apr 2008)
New Revision: 22880
Modified:
trunk/debathena/config/zephyr-config/debian/changelog
trunk/debathena/config/zephyr-config/debian/control
trunk/debathena/config/zephyr-config/debian/control.in
trunk/debathena/config/zephyr-config/debian/rules
Log:
Modified: trunk/debathena/config/zephyr-config/debian/changelog
===================================================================
--- trunk/debathena/config/zephyr-config/debian/changelog 2008-04-07 02:12:04 UTC (rev 22879)
+++ trunk/debathena/config/zephyr-config/debian/changelog 2008-04-07 02:28:10 UTC (rev 22880)
@@ -1,3 +1,9 @@
+debathena-zephyr-config (1.3) unstable; urgency=low
+
+ * Convert to the new config-package-dev interface
+
+ -- Shreevatsa R <vatsa@mit.edu> Sun, 6 Apr 2008 19:26:53 -0400
+
debathena-zephyr-config (1.2debathena1) unstable; urgency=low
* Start zhm from /etc/network/if-up.d.
Modified: trunk/debathena/config/zephyr-config/debian/control
===================================================================
--- trunk/debathena/config/zephyr-config/debian/control 2008-04-07 02:12:04 UTC (rev 22879)
+++ trunk/debathena/config/zephyr-config/debian/control 2008-04-07 02:28:10 UTC (rev 22880)
@@ -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, debathena-config-build-common (>= 3.2~)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev, config-package-dev (>= 3.2~)
Standards-Version: 3.7.2
Package: debathena-zephyr-config
Architecture: all
Depends: libzephyr3-krb, zephyr-clients, debathena-kerberos-config, ${misc:Depends}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: Zephyr configuration for Debian-Athena
This package configures Zephyr for the Debian-Athena system by
setting up the default Zephyr servers.
Modified: trunk/debathena/config/zephyr-config/debian/control.in
===================================================================
--- trunk/debathena/config/zephyr-config/debian/control.in 2008-04-07 02:12:04 UTC (rev 22879)
+++ trunk/debathena/config/zephyr-config/debian/control.in 2008-04-07 02:28:10 UTC (rev 22880)
@@ -8,6 +8,8 @@
Package: debathena-zephyr-config
Architecture: all
Depends: libzephyr3-krb, zephyr-clients, debathena-kerberos-config, ${misc:Depends}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: Zephyr configuration for Debian-Athena
This package configures Zephyr for the Debian-Athena system by
setting up the default Zephyr servers.
Modified: trunk/debathena/config/zephyr-config/debian/rules
===================================================================
--- trunk/debathena/config/zephyr-config/debian/rules 2008-04-07 02:12:04 UTC (rev 22879)
+++ trunk/debathena/config/zephyr-config/debian/rules 2008-04-07 02:28:10 UTC (rev 22880)
@@ -1,14 +1,15 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-zephyr-config += \
+DEB_DIVERT_EXTENSION = .debathena
+DEB_DIVERT_FILES_debathena-zephyr-config += \
/etc/default/zephyr-clients.debathena
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/debathena-divert.mk
-include /usr/share/cdbs/1/rules/debathena-debconf-hack.mk
+include /usr/share/cdbs/1/rules/replace-files.mk
+include /usr/share/cdbs/1/rules/debconf-divert.mk
common-install-indep::
- if hash dh_installifupdown; then \
+ if hash dh_installifupdown 2>/dev/null; then \
dh_installifupdown; \
else \
dh_installdirs etc/network/if-up.d; \
