[25763] in Source-Commits
/svn/athena r25215 - trunk/debathena/meta/login-graphical/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Sat Jul 2 23:43:51 2011
Date: Sat, 2 Jul 2011 23:43:44 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107030343.p633hibH007084@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-02 23:43:44 -0400 (Sat, 02 Jul 2011)
New Revision: 25215
Modified:
trunk/debathena/meta/login-graphical/debian/rules
Log:
Use better test for thunderbird 3.1 to avoid playing stupid
games with build depends
Modified: trunk/debathena/meta/login-graphical/debian/rules
===================================================================
--- trunk/debathena/meta/login-graphical/debian/rules 2011-07-03 03:29:10 UTC (rev 25214)
+++ trunk/debathena/meta/login-graphical/debian/rules 2011-07-03 03:43:44 UTC (rev 25215)
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
-TBIRD_VERSION = $(shell dpkg-query --showformat='$${Version}' --show thunderbird)
-TBIRD_3_1 = $(shell dpkg --compare-versions $(TBIRD_VERSION) ge '3.1~' && echo y)
+TBIRD_VERSION = $(shell apt-cache policy thunderbird 2>/dev/null | awk '/^ Candidate/ { print $$2 }')
+TBIRD_3_1 = $(shell dpkg --compare-versions '$(TBIRD_VERSION)' ge '3.1~' && echo y)
ifneq ($(TBIRD_3_1),y)
binary-predeb/debathena-login-graphical::
