[25501] in Source-Commits
/svn/athena r25031 - trunk/debathena/config/finger-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sat Mar 12 20:43:27 2011
Date: Sat, 12 Mar 2011 20:43:17 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103130143.p2D1hHwb009388@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 20:43:17 -0500 (Sat, 12 Mar 2011)
New Revision: 25031
Added:
trunk/debathena/config/finger-config/debian/finger.debathena
trunk/debathena/config/finger-config/debian/install
Modified:
trunk/debathena/config/finger-config/debian/changelog
trunk/debathena/config/finger-config/debian/compat
trunk/debathena/config/finger-config/debian/control.in
trunk/debathena/config/finger-config/debian/rules
Log:
In finger-config:
* Replace and Conflict debathena-finger (<= 10.0.2-0debathena1)
* Ship a tiny finger wrapper which adds -m on older platforms
Modified: trunk/debathena/config/finger-config/debian/changelog
===================================================================
--- trunk/debathena/config/finger-config/debian/changelog 2011-03-13 01:14:02 UTC (rev 25030)
+++ trunk/debathena/config/finger-config/debian/changelog 2011-03-13 01:43:17 UTC (rev 25031)
@@ -1,3 +1,10 @@
+debathena-finger-config (1.5) unstable; urgency=low
+
+ * Replace and Conflict debathena-finger (<= 10.0.2-0debathena1)
+ * Ship a tiny finger wrapper which adds -m on older platforms
+
+ -- Jonathan Reed <jdreed@mit.edu> Sat, 12 Mar 2011 20:42:08 -0500
+
debathena-finger-config (1.4) unstable; urgency=low
* Remove DEB_AUTO_UPDATE_DEBIAN_CONTROL.
Modified: trunk/debathena/config/finger-config/debian/compat
===================================================================
--- trunk/debathena/config/finger-config/debian/compat 2011-03-13 01:14:02 UTC (rev 25030)
+++ trunk/debathena/config/finger-config/debian/compat 2011-03-13 01:43:17 UTC (rev 25031)
@@ -1 +1 @@
-4
+5
Modified: trunk/debathena/config/finger-config/debian/control.in
===================================================================
--- trunk/debathena/config/finger-config/debian/control.in 2011-03-13 01:14:02 UTC (rev 25030)
+++ trunk/debathena/config/finger-config/debian/control.in 2011-03-13 01:43:17 UTC (rev 25031)
@@ -9,7 +9,8 @@
Architecture: all
Depends: debathena-finger (>= 9.4), ${misc:Depends}
Provides: ${diverted-files}
-Conflicts: ${diverted-files}
+Conflicts: ${diverted-files}, debathena-finger (<= 10.0.2-0debathena1)
+Replaces: debathena-finger (<= 10.0.2-0debathena1)
Description: Set Athena finger as default
This package makes /usr/bin/finger point to the Debathena
version.
Added: trunk/debathena/config/finger-config/debian/finger.debathena
===================================================================
--- trunk/debathena/config/finger-config/debian/finger.debathena (rev 0)
+++ trunk/debathena/config/finger-config/debian/finger.debathena 2011-03-13 01:43:17 UTC (rev 25031)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/finger.debathena-orig -m "$@"
Property changes on: trunk/debathena/config/finger-config/debian/finger.debathena
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/debathena/config/finger-config/debian/install
===================================================================
--- trunk/debathena/config/finger-config/debian/install (rev 0)
+++ trunk/debathena/config/finger-config/debian/install 2011-03-13 01:43:17 UTC (rev 25031)
@@ -0,0 +1 @@
+debian/finger.debathena usr/bin
Modified: trunk/debathena/config/finger-config/debian/rules
===================================================================
--- trunk/debathena/config/finger-config/debian/rules 2011-03-13 01:14:02 UTC (rev 25030)
+++ trunk/debathena/config/finger-config/debian/rules 2011-03-13 01:43:17 UTC (rev 25031)
@@ -1,11 +1,19 @@
#!/usr/bin/make -f
+FINGER_VERSION = $(shell dpkg-query --showformat='$${Version}' --show bsd-finger)
+# From the changelog for bsd-finger
+NEW_FINGER = $(shell dpkg --compare-versions $(FINGER_VERSION) ge '0.17-13~' && echo y)
+
DEB_DIVERT_EXTENSION = .debathena
-DEB_DIVERT_FILES_debathena-finger-config += \
+ifneq ($(NEW_FINGER),y)
+ # Older packages, continue to divert
+ DEB_DIVERT_FILES_debathena-finger-config += \
/usr/bin/finger.debathena
-DEB_UNDIVERT_FILES_debathena-finger-config += \
+ DEB_UNDIVERT_FILES_debathena-finger-config += \
/usr/share/man/man1/finger.debathena.1.gz
-DEB_UNDIVERT_VERSION_/usr/share/man/man1/finger.debathena.1.gz = 1.0debathena3~
+ DEB_UNDIVERT_VERSION_/usr/share/man/man1/finger.debathena.1.gz = 1.0debathena3~
+endif
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
