[25495] in Source-Commits
/svn/athena r25025 - trunk/debathena/config/from-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sat Mar 12 01:26:03 2011
Date: Sat, 12 Mar 2011 01:25:57 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103120625.p2C6Pvl3027489@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-03-12 01:25:57 -0500 (Sat, 12 Mar 2011)
New Revision: 25025
Added:
trunk/debathena/config/from-config/debian/postinst
trunk/debathena/config/from-config/debian/prerm
Modified:
trunk/debathena/config/from-config/debian/changelog
trunk/debathena/config/from-config/debian/rules
Log:
In from-config:
* Update for alternatives-aware versions of bsdmainutils (Trac #729)
Modified: trunk/debathena/config/from-config/debian/changelog
===================================================================
--- trunk/debathena/config/from-config/debian/changelog 2011-03-12 05:07:45 UTC (rev 25024)
+++ trunk/debathena/config/from-config/debian/changelog 2011-03-12 06:25:57 UTC (rev 25025)
@@ -1,3 +1,9 @@
+debathena-from-config (1.5) unstable; urgency=low
+
+ * Update for alternatives-aware versions of bsdmainutils (Trac #729)
+
+ -- Jonathan Reed <jdreed@mit.edu> Sat, 12 Mar 2011 01:15:07 -0500
+
debathena-from-config (1.4) unstable; urgency=low
* Update dependencies for merge of debathena-from into
Added: trunk/debathena/config/from-config/debian/postinst
===================================================================
--- trunk/debathena/config/from-config/debian/postinst (rev 0)
+++ trunk/debathena/config/from-config/debian/postinst 2011-03-12 06:25:57 UTC (rev 25025)
@@ -0,0 +1,44 @@
+#!/bin/sh
+# postinst script for debathena-from-config
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ configure)
+ if dpkg --compare-versions bsdmainutils ge '8.0.6~'; then
+ update-alteratives \
+ --install /usr/bin/from from /usr/bin/from.debathena 100 \
+ --slave /usr/share/man/man1/from.1.gz from.1.gz /usr/share/man/man1/from.debathena.1.gz
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Added: trunk/debathena/config/from-config/debian/prerm
===================================================================
--- trunk/debathena/config/from-config/debian/prerm (rev 0)
+++ trunk/debathena/config/from-config/debian/prerm 2011-03-12 06:25:57 UTC (rev 25025)
@@ -0,0 +1,44 @@
+#!/bin/sh
+# prerm script for debathena-from-config
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ remove|deconfigure)
+ if update-alteratives --list from | grep -q /usr/bin/from\.debathena; then
+ update-alternatives --remove from /usr/bin/from.debathena
+ fi
+ ;;
+
+ upgrade)
+ ;;
+
+ failed-upgrade)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Modified: trunk/debathena/config/from-config/debian/rules
===================================================================
--- trunk/debathena/config/from-config/debian/rules 2011-03-12 05:07:45 UTC (rev 25024)
+++ trunk/debathena/config/from-config/debian/rules 2011-03-12 06:25:57 UTC (rev 25025)
@@ -1,9 +1,16 @@
#!/usr/bin/make -f
-DEB_DIVERT_EXTENSION = .debathena
-DEB_DIVERT_FILES_debathena-from-config += \
+BSDMAINUTILS_VERSION = $(shell dpkg-query --showformat='$${Version}' --show bsdmainutils)
+# From the changelog for bsdmainutils
+USES_ALTERNATIVES = $(shell dpkg --compare-versions $(BSDMAINUTILS_VERSION) ge '8.0.6~' && echo y)
+
+ifeq ($(USES_ALTERNATIVES),y)
+ DEB_DIVERT_EXTENSION = .debathena
+ DEB_DIVERT_FILES_debathena-from-config += \
/usr/bin/from.debathena \
/usr/share/man/man1/from.debathena.1.gz
+endif
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
