[26006] in Source-Commits
/svn/athena r25341 - trunk/debathena/meta/extra-software/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Aug 1 15:12:06 2011
Date: Mon, 1 Aug 2011 15:12:00 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201108011912.p71JC0WW028612@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-08-01 15:12:00 -0400 (Mon, 01 Aug 2011)
New Revision: 25341
Added:
trunk/debathena/meta/extra-software/debian/ooffice
Modified:
trunk/debathena/meta/extra-software/debian/changelog
trunk/debathena/meta/extra-software/debian/control.in
trunk/debathena/meta/extra-software/debian/rules
Log:
In extra-software:
* Drop dependency on openoffice.org-java-common, since openoffice.org
(which we also depend on) depends on openoffice.org-java-common
* Conditionally depend on libreoffice and ship a wrapper (for now)
Modified: trunk/debathena/meta/extra-software/debian/changelog
===================================================================
--- trunk/debathena/meta/extra-software/debian/changelog 2011-08-01 17:28:42 UTC (rev 25340)
+++ trunk/debathena/meta/extra-software/debian/changelog 2011-08-01 19:12:00 UTC (rev 25341)
@@ -1,3 +1,11 @@
+debathena-extra-software (1.2) unstable; urgency=low
+
+ * Drop dependency on openoffice.org-java-common, since openoffice.org
+ (which we also depend on) depends on openoffice.org-java-common
+ * Conditionally depend on libreoffice and ship a wrapper (for now)
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 01 Aug 2011 15:06:04 -0400
+
debathena-extra-software (1.1) unstable; urgency=low
* Remove dependency on wmtop and demote wmbubble to a recommendation.
Modified: trunk/debathena/meta/extra-software/debian/control.in
===================================================================
--- trunk/debathena/meta/extra-software/debian/control.in 2011-08-01 17:28:42 UTC (rev 25340)
+++ trunk/debathena/meta/extra-software/debian/control.in 2011-08-01 19:12:00 UTC (rev 25341)
@@ -13,7 +13,7 @@
gnome-devel,
pidgin | gaim, pidgin-encryption | gaim-encryption,
gv,
- openoffice.org, openoffice.org-java-common,
+ ${debathena-cool-kids-office-suite},
thunderbird | mozilla-thunderbird | icedove,
vim-gnome,
gnuplot,
Added: trunk/debathena/meta/extra-software/debian/ooffice
===================================================================
--- trunk/debathena/meta/extra-software/debian/ooffice (rev 0)
+++ trunk/debathena/meta/extra-software/debian/ooffice 2011-08-01 19:12:00 UTC (rev 25341)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+msg="OpenOffice.org has been renamed to LibreOffice. You can launch it from
+the Applications menu, in the Office category. Or you can launch it by
+typing 'soffice' in the Terminal window."
+
+if [ -n "$DISPLAY" ]; then
+ zenity --info --title="OpenOffice.org Renamed" --no-wrap --text="$msg"
+else
+ cat <<EOF
+OpenOffice.org has been renamed to LibreOffice. You can launch it from
+the Applications menu, in the Office category. Or you can launch it by
+typing 'soffice' in the Terminal window.
+EOF
+fi
+exit 0
Property changes on: trunk/debathena/meta/extra-software/debian/ooffice
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/debathena/meta/extra-software/debian/rules
===================================================================
--- trunk/debathena/meta/extra-software/debian/rules 2011-08-01 17:28:42 UTC (rev 25340)
+++ trunk/debathena/meta/extra-software/debian/rules 2011-08-01 19:12:00 UTC (rev 25341)
@@ -1,10 +1,21 @@
#!/usr/bin/make -f
HAVE_ICEDTEA = $(shell apt-cache show icedtea6-plugin 2>/dev/null | grep -q '^Version:' && echo y)
+HAVE_LIBREOFFICE = $(shell apt-cache show libreoffice 2>/dev/null | grep -q '^Version:' && echo y)
ifeq ($(HAVE_ICEDTEA),y)
binary-predeb/debathena-extra-software::
echo "debathena-java-plugin=icedtea6-plugin" >> debian/debathena-extra-software.substvars
endif
+ifeq ($(HAVE_LIBREOFFICE),y)
+ install/debathena-extra-software::
+ dh_install debian/ooffice usr/bin
+ binary-predeb/debathena-extra-software::
+ echo "debathena-cool-kids-office-suite=libreoffice" >> debian/debathena-extra-software.substvars
+else
+ binary-predeb/debathena-extra-software::
+ echo "debathena-cool-kids-office-suite=openoffice.org" >> debian/debathena-extra-software.substvars
+endif
+
include /usr/share/cdbs/1/rules/debhelper.mk
