[25507] in Source-Commits
/svn/athena r25037 - trunk/debathena/config/finger-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sat Mar 12 21:45:51 2011
Date: Sat, 12 Mar 2011 21:45:45 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103130245.p2D2jjdf021897@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 21:45:45 -0500 (Sat, 12 Mar 2011)
New Revision: 25037
Modified:
trunk/debathena/config/finger-config/debian/changelog
trunk/debathena/config/finger-config/debian/control.in
trunk/debathena/config/finger-config/debian/rules
Log:
In finger-config:
* Conflict with finger (>= 0.17-13~)
* Ship a new finger.debathena which just runs finger with -m
Modified: trunk/debathena/config/finger-config/debian/changelog
===================================================================
--- trunk/debathena/config/finger-config/debian/changelog 2011-03-13 02:45:16 UTC (rev 25036)
+++ trunk/debathena/config/finger-config/debian/changelog 2011-03-13 02:45:45 UTC (rev 25037)
@@ -1,9 +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
+ * Conflict with finger (>= 0.17-13~)
+ * Ship a new finger.debathena which just runs finger with -m
- -- Jonathan Reed <jdreed@mit.edu> Sat, 12 Mar 2011 20:42:08 -0500
+ -- Jonathan Reed <jdreed@mit.edu> Sat, 12 Mar 2011 21:36:18 -0500
debathena-finger-config (1.4) unstable; urgency=low
Modified: trunk/debathena/config/finger-config/debian/control.in
===================================================================
--- trunk/debathena/config/finger-config/debian/control.in 2011-03-13 02:45:16 UTC (rev 25036)
+++ trunk/debathena/config/finger-config/debian/control.in 2011-03-13 02:45:45 UTC (rev 25037)
@@ -9,7 +9,7 @@
Architecture: all
Depends: debathena-finger (>= 9.4), ${misc:Depends}
Provides: ${diverted-files}
-Conflicts: ${diverted-files}, debathena-finger (<= 10.0.2-0debathena1)
+Conflicts: ${diverted-files}, debathena-finger (<= 10.0.2-0debathena1), finger (>= 0.17-13)
Replaces: debathena-finger (<= 10.0.2-0debathena1)
Description: Set Athena finger as default
This package makes /usr/bin/finger point to the Debathena
Modified: trunk/debathena/config/finger-config/debian/rules
===================================================================
--- trunk/debathena/config/finger-config/debian/rules 2011-03-13 02:45:16 UTC (rev 25036)
+++ trunk/debathena/config/finger-config/debian/rules 2011-03-13 02:45:45 UTC (rev 25037)
@@ -1,25 +1,11 @@
#!/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
-
-ifneq ($(NEW_FINGER),y)
- # Older packages, continue to divert
- DEB_DIVERT_FILES_debathena-finger-config += \
+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~
-else
- DEB_UNDIVERT_FILES_debathena-finger-config += \
- /usr/bin/finger.debathena \
- /usr/share/man/man1/finger.debathena.1.gz
- DEB_UNDIVERT_VERSION_/usr/bin/finger.debathena = 1.5~
- DEB_UNDIVERT_VERSION_/usr/share/man/man1/finger.debathena.1.gz = 1.0debathena3~
-endif
+DEB_UNDIVERT_VERSION_/usr/share/man/man1/finger.debathena.1.gz = 1.0debathena3~
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
