[23205] in Source-Commits
/svn/athena r22866 - trunk/debathena/config/nsswitch-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 20:37:00 2008
Date: Sun, 6 Apr 2008 20:36:46 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804070036.UAA03702@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 20:36:46 -0400 (Sun, 06 Apr 2008)
New Revision: 22866
Modified:
trunk/debathena/config/nsswitch-config/debian/changelog
trunk/debathena/config/nsswitch-config/debian/control
trunk/debathena/config/nsswitch-config/debian/control.in
trunk/debathena/config/nsswitch-config/debian/rules
Log:
Modified: trunk/debathena/config/nsswitch-config/debian/changelog
===================================================================
--- trunk/debathena/config/nsswitch-config/debian/changelog 2008-04-07 00:30:49 UTC (rev 22865)
+++ trunk/debathena/config/nsswitch-config/debian/changelog 2008-04-07 00:36:46 UTC (rev 22866)
@@ -1,3 +1,9 @@
+debathena-nsswitch-config (1.7) unstable; urgency=low
+
+ * Convert to the new config-package-dev interface
+
+ -- Shreevatsa R <vatsa@mit.edu> Sun, 6 Apr 2008 18:52:24 -0400
+
debathena-nsswitch-config (1.6) unstable; urgency=low
* Remove incorrect manpage symlinks from rules file.
Modified: trunk/debathena/config/nsswitch-config/debian/control
===================================================================
--- trunk/debathena/config/nsswitch-config/debian/control 2008-04-07 00:30:49 UTC (rev 22865)
+++ trunk/debathena/config/nsswitch-config/debian/control 2008-04-07 00:36:46 UTC (rev 22866)
@@ -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.7~)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev
Standards-Version: 3.7.2
Package: debathena-nsswitch-config
Architecture: all
Depends: debathena-hesiod-config, debathena-autofs-config, libnss-nonlocal (>= 1.3~), libnss-afspag, ${misc:Depends}
-Provides: ${divert:Diverted}
-Conflicts: ${divert:Diverted}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: nsswitch configuration for Debian-Athena
This packages configures nsswitch to get passwd information from
Athena Hesiod, using libnss-nonlocal, which prevents network users
Modified: trunk/debathena/config/nsswitch-config/debian/control.in
===================================================================
--- trunk/debathena/config/nsswitch-config/debian/control.in 2008-04-07 00:30:49 UTC (rev 22865)
+++ trunk/debathena/config/nsswitch-config/debian/control.in 2008-04-07 00:36:46 UTC (rev 22866)
@@ -8,8 +8,8 @@
Package: debathena-nsswitch-config
Architecture: all
Depends: debathena-hesiod-config, debathena-autofs-config, libnss-nonlocal (>= 1.3~), libnss-afspag, ${misc:Depends}
-Provides: ${divert:Diverted}
-Conflicts: ${divert:Diverted}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: nsswitch configuration for Debian-Athena
This packages configures nsswitch to get passwd information from
Athena Hesiod, using libnss-nonlocal, which prevents network users
Modified: trunk/debathena/config/nsswitch-config/debian/rules
===================================================================
--- trunk/debathena/config/nsswitch-config/debian/rules 2008-04-07 00:30:49 UTC (rev 22865)
+++ trunk/debathena/config/nsswitch-config/debian/rules 2008-04-07 00:36:46 UTC (rev 22866)
@@ -1,13 +1,14 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_REPLACE_CONFFILES_debathena-nsswitch-config += \
+DEB_DIVERT_EXTENSION = .debathena
+DEB_REPLACE_FILES_debathena-nsswitch-config += \
/etc/nsswitch.conf.debathena
ifneq ($(wildcard /usr/share/base-files/nsswitch.conf),)
- DEBATHENA_CHECK_CONFFILES_SOURCE_/etc/nsswitch.conf.debathena = \
+ DEB_CHECK_FILES_SOURCE_/etc/nsswitch.conf.debathena = \
/usr/share/base-files/nsswitch.conf
endif
-DEBATHENA_DIVERT_FILES_debathena-nsswitch-config += \
+DEB_DIVERT_FILES_debathena-nsswitch-config += \
/usr/sbin/adduser.debathena \
/usr/sbin/groupadd.debathena \
/usr/sbin/addgroup.debathena \
@@ -16,5 +17,5 @@
/usr/sbin/invoke-rc.d.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
