[26094] in Source-Commits
/svn/athena r25386 - in trunk/debathena/meta: thirdparty-sound/debian thirdparty-text/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Aug 23 16:21:59 2011
Date: Tue, 23 Aug 2011 16:21:53 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201108232021.p7NKLrlQ010527@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-08-23 16:21:53 -0400 (Tue, 23 Aug 2011)
New Revision: 25386
Modified:
trunk/debathena/meta/thirdparty-sound/debian/changelog
trunk/debathena/meta/thirdparty-sound/debian/control.in
trunk/debathena/meta/thirdparty-text/debian/changelog
trunk/debathena/meta/thirdparty-text/debian/control.in
trunk/debathena/meta/thirdparty-text/debian/rules
Log:
In thirdparty-sound:
* Add rhythmbox
In thirdparty-text:
* Add artha and gnome-dictionary if they exist
Modified: trunk/debathena/meta/thirdparty-sound/debian/changelog
===================================================================
--- trunk/debathena/meta/thirdparty-sound/debian/changelog 2011-08-23 14:02:09 UTC (rev 25385)
+++ trunk/debathena/meta/thirdparty-sound/debian/changelog 2011-08-23 20:21:53 UTC (rev 25386)
@@ -1,3 +1,9 @@
+debathena-thirdparty-sound (1.1) unstable; urgency=low
+
+ * Add rhythmbox
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 23 Aug 2011 16:16:26 -0400
+
debathena-thirdparty-sound (1.0) unstable; urgency=low
* First non-equivs version
Modified: trunk/debathena/meta/thirdparty-sound/debian/control.in
===================================================================
--- trunk/debathena/meta/thirdparty-sound/debian/control.in 2011-08-23 14:02:09 UTC (rev 25385)
+++ trunk/debathena/meta/thirdparty-sound/debian/control.in 2011-08-23 20:21:53 UTC (rev 25386)
@@ -9,6 +9,7 @@
Architecture: all
Depends: sox,
libsox-dev,
+ rhythmbox,
${misc:Depends}
Description: Debathena metapackage for third-party sound software
This includes a set of subpackages of commonly-used third-party software
Modified: trunk/debathena/meta/thirdparty-text/debian/changelog
===================================================================
--- trunk/debathena/meta/thirdparty-text/debian/changelog 2011-08-23 14:02:09 UTC (rev 25385)
+++ trunk/debathena/meta/thirdparty-text/debian/changelog 2011-08-23 20:21:53 UTC (rev 25386)
@@ -1,3 +1,9 @@
+debathena-thirdparty-text (1.1) unstable; urgency=low
+
+ * Add artha and gnome-dictionary if they exist
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 23 Aug 2011 16:20:34 -0400
+
debathena-thirdparty-text (1.0) unstable; urgency=low
* First non-equivs release
Modified: trunk/debathena/meta/thirdparty-text/debian/control.in
===================================================================
--- trunk/debathena/meta/thirdparty-text/debian/control.in 2011-08-23 14:02:09 UTC (rev 25385)
+++ trunk/debathena/meta/thirdparty-text/debian/control.in 2011-08-23 20:21:53 UTC (rev 25386)
@@ -18,6 +18,8 @@
xpdf,
jedit,
pdfedit,
+ ${debathena-maybe-artha},
+ ${debathena-maybe-gnome-dictionary},
${misc:Depends}
Recommends: abiword-plugins-gnome
Description: Debathena metapackage for third-party text software
Modified: trunk/debathena/meta/thirdparty-text/debian/rules
===================================================================
--- trunk/debathena/meta/thirdparty-text/debian/rules 2011-08-23 14:02:09 UTC (rev 25385)
+++ trunk/debathena/meta/thirdparty-text/debian/rules 2011-08-23 20:21:53 UTC (rev 25386)
@@ -1,3 +1,17 @@
#!/usr/bin/make -f
+HAVE_ARTHA = $(shell apt-cache show artha 2>/dev/null | grep -q '^Version:' && echo y)
+
+ifeq ($(HAVE_ARTHA),y)
+ binary-predeb/debathena-thirdparty-text::
+ echo "debathena-maybe-artha=artha" >> debian/debathena-thirdparty-text.substvars
+endif
+
+HAVE_GNOME-DICTIONARY = $(shell apt-cache show gnome-dictionary 2>/dev/null | grep -q '^Version:' && echo y)
+
+ifeq ($(HAVE_GNOME-DICTIONARY),y)
+ binary-predeb/debathena-thirdparty-text::
+ echo "debathena-maybe-gnome-dictionary=gnome-dictionary" >> debian/debathena-thirdparty-text.substvars
+endif
+
include /usr/share/cdbs/1/rules/debhelper.mk
