[25767] in Source-Commits
/svn/athena r25219 - trunk/debathena/meta/login-graphical/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sun Jul 3 00:26:27 2011
Date: Sun, 3 Jul 2011 00:26:20 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107030426.p634QKNv015837@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-03 00:26:20 -0400 (Sun, 03 Jul 2011)
New Revision: 25219
Modified:
trunk/debathena/meta/login-graphical/debian/rules
Log:
Fix rules again, because thunderbird is referred to so will show
up in apt-cache policy as "(none)" instead of the empty string
Modified: trunk/debathena/meta/login-graphical/debian/rules
===================================================================
--- trunk/debathena/meta/login-graphical/debian/rules 2011-07-03 04:15:54 UTC (rev 25218)
+++ trunk/debathena/meta/login-graphical/debian/rules 2011-07-03 04:26:20 UTC (rev 25219)
@@ -1,9 +1,9 @@
#!/usr/bin/make -f
-TBIRD_VERSION = $(shell apt-cache policy thunderbird 2>/dev/null | awk '/^ Candidate/ { print $$2 }')
+TBIRD_VERSION = $(shell apt-cache policy thunderbird 2>/dev/null | awk '/^ Candidate/ { print $$2 }' | fgrep -vx '(none)')
TBIRD_3_1 = $(shell dpkg --compare-versions '$(TBIRD_VERSION)' ge '3.1~' && echo y)
ICED_VERSION = $(shell apt-cache policy icedove 2>/dev/null | awk '/^ Can\
-didate/ { print $$2 }')
+didate/ { print $$2 }' | fgrep -vx '(none)')
ICED_3_1 = $(shell dpkg --compare-versions '$(ICED_VERSION)' ge '3.1~' && ech\
o y)
