[25899] in Source-Commits
/svn/athena r25287 - trunk/debathena/meta/extra-software-nox/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jul 27 11:14:07 2011
Date: Wed, 27 Jul 2011 11:14:01 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107271514.p6RFE1gg017395@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-27 11:14:01 -0400 (Wed, 27 Jul 2011)
New Revision: 25287
Modified:
trunk/debathena/meta/extra-software-nox/debian/changelog
trunk/debathena/meta/extra-software-nox/debian/control.in
trunk/debathena/meta/extra-software-nox/debian/rules
Log:
In extra-software-nox:
* Conditionally depend on libstdc++5 if it exists
Modified: trunk/debathena/meta/extra-software-nox/debian/changelog
===================================================================
--- trunk/debathena/meta/extra-software-nox/debian/changelog 2011-07-27 15:07:05 UTC (rev 25286)
+++ trunk/debathena/meta/extra-software-nox/debian/changelog 2011-07-27 15:14:01 UTC (rev 25287)
@@ -1,3 +1,9 @@
+debathena-extra-software-nox (1.2) unstable; urgency=low
+
+ * Conditionally depend on libstdc++5 if it exists
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 27 Jul 2011 11:13:43 -0400
+
debathena-extra-software-nox (1.1) unstable; urgency=low
* Dropping the dependency on debathena-build-depends also dropped our
Modified: trunk/debathena/meta/extra-software-nox/debian/control.in
===================================================================
--- trunk/debathena/meta/extra-software-nox/debian/control.in 2011-07-27 15:07:05 UTC (rev 25286)
+++ trunk/debathena/meta/extra-software-nox/debian/control.in 2011-07-27 15:14:01 UTC (rev 25287)
@@ -38,6 +38,7 @@
expect,
traceroute,
fortune-mod,
+ ${debathena-libstdc5-depends},
${misc:Depends}
Recommends: ckermit,
openjdk-6-jdk,
Modified: trunk/debathena/meta/extra-software-nox/debian/rules
===================================================================
--- trunk/debathena/meta/extra-software-nox/debian/rules 2011-07-27 15:07:05 UTC (rev 25286)
+++ trunk/debathena/meta/extra-software-nox/debian/rules 2011-07-27 15:14:01 UTC (rev 25287)
@@ -1,3 +1,10 @@
#!/usr/bin/make -f
+HAVE_LIBSTDC5 = $(shell apt-cache show libstdc++5 2>/dev/null | grep -q '^Version:' && echo y)
+
+ifeq ($(HAVE_LIBSTDC5),y)
+ binary-predeb/debathena-extra-software-nox::
+ echo "debathena-libstdc5-depends=libstdc++5" >> debian/debathena-extra-software-nox.substvars
+endif
+
include /usr/share/cdbs/1/rules/debhelper.mk
