[25499] in Source-Commits
/svn/athena r25029 - trunk/debathena/config/from-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sat Mar 12 19:48:24 2011
Date: Sat, 12 Mar 2011 19:48:18 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103130048.p2D0mIl6030570@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 19:48:17 -0500 (Sat, 12 Mar 2011)
New Revision: 25029
Modified:
trunk/debathena/config/from-config/debian/control.in
trunk/debathena/config/from-config/debian/rules
Log:
Add a Breaks field and generate appropriate substvars line
Modified: trunk/debathena/config/from-config/debian/control.in
===================================================================
--- trunk/debathena/config/from-config/debian/control.in 2011-03-12 21:18:41 UTC (rev 25028)
+++ trunk/debathena/config/from-config/debian/control.in 2011-03-13 00:48:17 UTC (rev 25029)
@@ -10,5 +10,6 @@
Depends: debathena-mitmailutils (>= 10.1.0), ${misc:Depends}
Provides: ${diverted-files}
Conflicts: ${diverted-files}, ${debathena-from-config-conflicts}
+Breaks: ${debathena-from-config-breaks}
Description: Set Athena from as default
This package makes /usr/bin/from point to the Debathena version.
Modified: trunk/debathena/config/from-config/debian/rules
===================================================================
--- trunk/debathena/config/from-config/debian/rules 2011-03-12 21:18:41 UTC (rev 25028)
+++ trunk/debathena/config/from-config/debian/rules 2011-03-13 00:48:17 UTC (rev 25029)
@@ -10,11 +10,13 @@
DEB_DIVERT_FILES_debathena-from-config += \
/usr/bin/from.debathena \
/usr/share/man/man1/from.debathena.1.gz
+ binary-predeb/debathena-from-config::
+ echo "debathena-from-config-breaks=bsdmainutils (>= 8.0.6~)" >> debian/debathena-from-config.substvars
else
# Newer packages: undivert, generate Conflicts, generate postinst
# Except we can't use DEB_UNDIVERT_FILES because of Trac #549
binary-predeb/debathena-from-config::
- echo "debathena-from-config-conflicts=bsdmainutils (<8.0.6~)" >> debian/debathena-from-config.substvars
+ echo "debathena-from-config-conflicts=bsdmainutils (<< 8.0.6~)" >> debian/debathena-from-config.substvars
common-build-indep::
cp -f debian/postinst-alternatives debian/postinst
clean::
