[23191] in Source-Commits

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

/svn/athena r22852 - trunk/debathena/config/moira-passwd-config/debian

daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 18:44:37 2008

Date: Sun, 6 Apr 2008 18:44:04 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804062244.SAA01431@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:44:03 -0400 (Sun, 06 Apr 2008)
New Revision: 22852

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


Modified: trunk/debathena/config/moira-passwd-config/debian/changelog
===================================================================
--- trunk/debathena/config/moira-passwd-config/debian/changelog	2008-04-06 22:43:31 UTC (rev 22851)
+++ trunk/debathena/config/moira-passwd-config/debian/changelog	2008-04-06 22:44:03 UTC (rev 22852)
@@ -1,3 +1,9 @@
+debathena-moira-passwd-config (1.1) unstable; urgency=low
+
+  * Convert to the new config-package-dev interface
+
+ -- Shreevatsa R <vatsa@mit.edu>  Sun,  6 Apr 2008 18:28:51 -0400
+
 debathena-moira-passwd-config (1.0debathena5) unstable; urgency=low
 
   * Make chsh and chfn wrappers support empty argument lists.

Modified: trunk/debathena/config/moira-passwd-config/debian/control
===================================================================
--- trunk/debathena/config/moira-passwd-config/debian/control	2008-04-06 22:43:31 UTC (rev 22851)
+++ trunk/debathena/config/moira-passwd-config/debian/control	2008-04-06 22:44:03 UTC (rev 22852)
@@ -2,13 +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
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev
 Standards-Version: 3.7.2
 
 Package: debathena-moira-passwd-config
 Architecture: all
 Depends: debathena-moira-clients (>= 4.0.0+cvs20070129), ${misc:Depends}, adduser
-Conflicts: debathena-moira-user-tools (<= 4.0.0-3)
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}, debathena-moira-user-tools (<= 4.0.0-3)
 Replaces: debathena-moira-user-tools (<= 4.0.0-3)
 Description: Set Athena chsh and chfn as default
  This package makes /usr/bin/chsh and /usr/bin/chfn point to the

Modified: trunk/debathena/config/moira-passwd-config/debian/control.in
===================================================================
--- trunk/debathena/config/moira-passwd-config/debian/control.in	2008-04-06 22:43:31 UTC (rev 22851)
+++ trunk/debathena/config/moira-passwd-config/debian/control.in	2008-04-06 22:44:03 UTC (rev 22852)
@@ -8,7 +8,8 @@
 Package: debathena-moira-passwd-config
 Architecture: all
 Depends: debathena-moira-clients (>= 4.0.0+cvs20070129), ${misc:Depends}, adduser
-Conflicts: debathena-moira-user-tools (<= 4.0.0-3)
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}, debathena-moira-user-tools (<= 4.0.0-3)
 Replaces: debathena-moira-user-tools (<= 4.0.0-3)
 Description: Set Athena chsh and chfn as default
  This package makes /usr/bin/chsh and /usr/bin/chfn point to the

Modified: trunk/debathena/config/moira-passwd-config/debian/rules
===================================================================
--- trunk/debathena/config/moira-passwd-config/debian/rules	2008-04-06 22:43:31 UTC (rev 22851)
+++ trunk/debathena/config/moira-passwd-config/debian/rules	2008-04-06 22:44:03 UTC (rev 22852)
@@ -1,8 +1,10 @@
 #!/usr/bin/make -f
 
 DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-moira-passwd-config += \
+DEB_DIVERT_EXTENSION = .debathena
+DEB_DIVERT_FILES_debathena-moira-passwd-config += \
 	/usr/bin/chfn.debathena \
 	/usr/bin/chsh.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
+


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