[23201] in Source-Commits
/svn/athena r22862 - trunk/debathena/config/shell-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 20:20:51 2008
Date: Sun, 6 Apr 2008 20:20:37 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804070020.UAA03489@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:20:36 -0400 (Sun, 06 Apr 2008)
New Revision: 22862
Modified:
trunk/debathena/config/shell-config/debian/changelog
trunk/debathena/config/shell-config/debian/control
trunk/debathena/config/shell-config/debian/control.in
trunk/debathena/config/shell-config/debian/rules
Log:
Modified: trunk/debathena/config/shell-config/debian/changelog
===================================================================
--- trunk/debathena/config/shell-config/debian/changelog 2008-04-07 00:19:20 UTC (rev 22861)
+++ trunk/debathena/config/shell-config/debian/changelog 2008-04-07 00:20:36 UTC (rev 22862)
@@ -1,3 +1,9 @@
+debathena-shell-config (1.4) unstable; urgency=low
+
+ * Convert to the new config-package-dev interface
+
+ -- Shreevatsa R <vatsa@mit.edu> Sun, 6 Apr 2008 19:03:49 -0400
+
debathena-shell-config (1.3) unstable; urgency=low
* Have renew aklog rather than "fsid -a" so that it works even if the
Modified: trunk/debathena/config/shell-config/debian/control
===================================================================
--- trunk/debathena/config/shell-config/debian/control 2008-04-07 00:19:20 UTC (rev 22861)
+++ trunk/debathena/config/shell-config/debian/control 2008-04-07 00:20:36 UTC (rev 22862)
@@ -2,12 +2,14 @@
Section: debathena-config/shells
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-bash-config
Architecture: all
Depends: debathena-attach, debathena-machtype, debathena-zephyr-config
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: bash configuration for Debian-Athena
This package configures /etc/bash.bashrc to provide things like add,
renew, and sets of the ATHENA_SYS and ATHENA_SYS_COMPAT environment
@@ -19,6 +21,8 @@
Package: debathena-tcsh-config
Architecture: all
Depends: debathena-attach, debathena-machtype, debathena-zephyr-config, tcsh
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: tcsh configuration for Debian-Athena
This package configures /etc/csh.cshrc to provide things like add,
renew, and sets of the ATHENA_SYS and ATHENA_SYS_COMPAT environment
Modified: trunk/debathena/config/shell-config/debian/control.in
===================================================================
--- trunk/debathena/config/shell-config/debian/control.in 2008-04-07 00:19:20 UTC (rev 22861)
+++ trunk/debathena/config/shell-config/debian/control.in 2008-04-07 00:20:36 UTC (rev 22862)
@@ -8,6 +8,8 @@
Package: debathena-bash-config
Architecture: all
Depends: debathena-attach, debathena-machtype, debathena-zephyr-config
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: bash configuration for Debian-Athena
This package configures /etc/bash.bashrc to provide things like add,
renew, and sets of the ATHENA_SYS and ATHENA_SYS_COMPAT environment
@@ -19,6 +21,8 @@
Package: debathena-tcsh-config
Architecture: all
Depends: debathena-attach, debathena-machtype, debathena-zephyr-config, tcsh
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: tcsh configuration for Debian-Athena
This package configures /etc/csh.cshrc to provide things like add,
renew, and sets of the ATHENA_SYS and ATHENA_SYS_COMPAT environment
Modified: trunk/debathena/config/shell-config/debian/rules
===================================================================
--- trunk/debathena/config/shell-config/debian/rules 2008-04-07 00:19:20 UTC (rev 22861)
+++ trunk/debathena/config/shell-config/debian/rules 2008-04-07 00:20:36 UTC (rev 22862)
@@ -1,10 +1,11 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-bash-config += \
+DEB_DIVERT_EXTENSION = .debathena
+DEB_DIVERT_FILES_debathena-bash-config += \
/etc/bash.bashrc.debathena \
/etc/profile.debathena
-DEBATHENA_DIVERT_FILES_debathena-tcsh-config += \
+DEB_DIVERT_FILES_debathena-tcsh-config += \
/etc/csh.cshrc.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
