[26593] in Source-Commits
/svn/athena r25642 - in trunk/debathena/meta: thirdparty-languages/debian thirdparty-simulation/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jul 18 12:25:35 2012
Date: Wed, 18 Jul 2012 12:25:33 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201207181625.q6IGPXpK019743@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-07-18 12:25:33 -0400 (Wed, 18 Jul 2012)
New Revision: 25642
Modified:
trunk/debathena/meta/thirdparty-languages/debian/changelog
trunk/debathena/meta/thirdparty-languages/debian/control.in
trunk/debathena/meta/thirdparty-languages/debian/rules
trunk/debathena/meta/thirdparty-simulation/debian/changelog
trunk/debathena/meta/thirdparty-simulation/debian/control.in
trunk/debathena/meta/thirdparty-simulation/debian/rules
Log:
In thirdparty-languages:
* Maybe depend on gccgo (Trac: #1155)
In thirdparty-simulation:
* Add jmol, jmol-applet if available (Trac: #1155)
Modified: trunk/debathena/meta/thirdparty-languages/debian/changelog
===================================================================
--- trunk/debathena/meta/thirdparty-languages/debian/changelog 2012-07-18 16:02:24 UTC (rev 25641)
+++ trunk/debathena/meta/thirdparty-languages/debian/changelog 2012-07-18 16:25:33 UTC (rev 25642)
@@ -1,3 +1,9 @@
+debathena-thirdparty-languages (1.2) unstable; urgency=low
+
+ * Maybe depend on gccgo (Trac: #1155)
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 18 Jul 2012 12:23:39 -0400
+
debathena-thirdparty-languages (1.1) unstable; urgency=low
* jython-gcj is now part of jython
Modified: trunk/debathena/meta/thirdparty-languages/debian/control.in
===================================================================
--- trunk/debathena/meta/thirdparty-languages/debian/control.in 2012-07-18 16:02:24 UTC (rev 25641)
+++ trunk/debathena/meta/thirdparty-languages/debian/control.in 2012-07-18 16:25:33 UTC (rev 25642)
@@ -41,6 +41,7 @@
scala,
irb,
flex,
+ ${debathena-maybe-gccgo},
${misc:Depends}
Recommends:
mit-scheme,
Modified: trunk/debathena/meta/thirdparty-languages/debian/rules
===================================================================
--- trunk/debathena/meta/thirdparty-languages/debian/rules 2012-07-18 16:02:24 UTC (rev 25641)
+++ trunk/debathena/meta/thirdparty-languages/debian/rules 2012-07-18 16:25:33 UTC (rev 25642)
@@ -1,3 +1,10 @@
#!/usr/bin/make -f
+HAVE_GCCGO = $(shell apt-cache show gccgo 2>/dev/null | grep -q '^Version:' & echo y)
+
+ifeq ($(HAVE_GCCGO),y)
+ binary-predeb/debathena-thirdparty-languages::
+ echo "debathena-maybe-gccgo=gccgo" >> debian/debathena-thirdparty-languages.substvars
+endif
+
include /usr/share/cdbs/1/rules/debhelper.mk
Modified: trunk/debathena/meta/thirdparty-simulation/debian/changelog
===================================================================
--- trunk/debathena/meta/thirdparty-simulation/debian/changelog 2012-07-18 16:02:24 UTC (rev 25641)
+++ trunk/debathena/meta/thirdparty-simulation/debian/changelog 2012-07-18 16:25:33 UTC (rev 25642)
@@ -1,3 +1,9 @@
+debathena-thirdparty-simulation (1.1) unstable; urgency=low
+
+ * Add jmol, jmol-applet if available (Trac: #1155)
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 18 Jul 2012 12:20:55 -0400
+
debathena-thirdparty-simulation (1.0) unstable; urgency=low
* First non-equivs release
Modified: trunk/debathena/meta/thirdparty-simulation/debian/control.in
===================================================================
--- trunk/debathena/meta/thirdparty-simulation/debian/control.in 2012-07-18 16:02:24 UTC (rev 25641)
+++ trunk/debathena/meta/thirdparty-simulation/debian/control.in 2012-07-18 16:25:33 UTC (rev 25642)
@@ -44,6 +44,7 @@
mpb,
mpb-doc,
openbabel,
+ ${debathena-maybe-jmol},
${misc:Depends}
Description: Debathena metapackage for third-party simulation software
This includes a set of subpackages of commonly-used third-party software
Modified: trunk/debathena/meta/thirdparty-simulation/debian/rules
===================================================================
--- trunk/debathena/meta/thirdparty-simulation/debian/rules 2012-07-18 16:02:24 UTC (rev 25641)
+++ trunk/debathena/meta/thirdparty-simulation/debian/rules 2012-07-18 16:25:33 UTC (rev 25642)
@@ -1,3 +1,10 @@
#!/usr/bin/make -f
+HAVE_JMOL = $(shell apt-cache show jmol 2>/dev/null | grep -q '^Version:' && echo y)
+
+ifeq ($(HAVE_JMOL),y)
+ binary-predeb/debathena-thirdparty-simulation::
+ echo "debathena-maybe-jmol=jmol,jmol-applet" >> debian/debathena-thirdparty-simulation.substvars
+endif
+
include /usr/share/cdbs/1/rules/debhelper.mk
