[23188] in Source-Commits
/svn/athena r22849 - trunk/debathena/config/from-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 18:37:32 2008
Date: Sun, 6 Apr 2008 18:37:00 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804062237.SAA01318@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:37:00 -0400 (Sun, 06 Apr 2008)
New Revision: 22849
Modified:
trunk/debathena/config/from-config/debian/changelog
trunk/debathena/config/from-config/debian/control
trunk/debathena/config/from-config/debian/control.in
trunk/debathena/config/from-config/debian/rules
Log:
Modified: trunk/debathena/config/from-config/debian/changelog
===================================================================
--- trunk/debathena/config/from-config/debian/changelog 2008-04-06 21:37:13 UTC (rev 22848)
+++ trunk/debathena/config/from-config/debian/changelog 2008-04-06 22:37:00 UTC (rev 22849)
@@ -1,3 +1,9 @@
+debathena-from-config (1.1) unstable; urgency=low
+
+ * Convert to the new config-package-dev interface
+
+ -- Shreevatsa R <vatsa@mit.edu> Sun, 6 Apr 2008 18:23:40 -0400
+
debathena-from-config (1.0debathena2) unstable; urgency=low
* Rebuild against debathena-config-build-common 3.4.
Modified: trunk/debathena/config/from-config/debian/control
===================================================================
--- trunk/debathena/config/from-config/debian/control 2008-04-06 21:37:13 UTC (rev 22848)
+++ trunk/debathena/config/from-config/debian/control 2008-04-06 22:37:00 UTC (rev 22849)
@@ -2,7 +2,7 @@
Section: debathena-config/mail
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-from-config
Modified: trunk/debathena/config/from-config/debian/control.in
===================================================================
--- trunk/debathena/config/from-config/debian/control.in 2008-04-06 21:37:13 UTC (rev 22848)
+++ trunk/debathena/config/from-config/debian/control.in 2008-04-06 22:37:00 UTC (rev 22849)
@@ -8,5 +8,7 @@
Package: debathena-from-config
Architecture: all
Depends: debathena-from (>= 9.4), ${misc:Depends}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: Set Athena from as default
This package makes /usr/bin/from point to the Debian-Athena version.
Modified: trunk/debathena/config/from-config/debian/rules
===================================================================
--- trunk/debathena/config/from-config/debian/rules 2008-04-06 21:37:13 UTC (rev 22848)
+++ trunk/debathena/config/from-config/debian/rules 2008-04-06 22:37:00 UTC (rev 22849)
@@ -1,8 +1,10 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-from-config += \
+DEB_DIVERT_EXTENSION = .debathena
+DEB_DIVERT_FILES_debathena-from-config += \
/usr/bin/from.debathena \
/usr/share/man/man1/from.debathena.1.gz
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
+
