[26526] in Source-Commits
/svn/athena r25610 - trunk/debathena/meta/extra-software/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Jul 3 13:56:12 2012
Date: Tue, 3 Jul 2012 13:56:10 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201207031756.q63HuAOC022863@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-07-03 13:56:10 -0400 (Tue, 03 Jul 2012)
New Revision: 25610
Modified:
trunk/debathena/meta/extra-software/debian/changelog
trunk/debathena/meta/extra-software/debian/ooffice
trunk/debathena/meta/extra-software/debian/rules
Log:
In extra-software:
* include debhelper.mk before adding to the targets, not after.
* Don't tell people to run "soffice", that's just stupid.
Modified: trunk/debathena/meta/extra-software/debian/changelog
===================================================================
--- trunk/debathena/meta/extra-software/debian/changelog 2012-07-03 15:44:50 UTC (rev 25609)
+++ trunk/debathena/meta/extra-software/debian/changelog 2012-07-03 17:56:10 UTC (rev 25610)
@@ -1,3 +1,10 @@
+debathena-extra-software (1.4) unstable; urgency=low
+
+ * include debhelper.mk before adding to the targets, not after.
+ * Don't tell people to run "soffice", that's just stupid.
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 03 Jul 2012 13:56:58 -0400
+
debathena-extra-software (1.3) unstable; urgency=low
* Demote wmfire to a Recommendation because it doesn't exist in oneiric
Modified: trunk/debathena/meta/extra-software/debian/ooffice
===================================================================
--- trunk/debathena/meta/extra-software/debian/ooffice 2012-07-03 15:44:50 UTC (rev 25609)
+++ trunk/debathena/meta/extra-software/debian/ooffice 2012-07-03 17:56:10 UTC (rev 25610)
@@ -2,7 +2,7 @@
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."
+typing 'libreoffice' in the Terminal window."
if [ -n "$DISPLAY" ]; then
zenity --info --title="OpenOffice.org Renamed" --no-wrap --text="$msg"
@@ -10,7 +10,7 @@
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.
+typing 'libreoffice' in the Terminal window.
EOF
fi
exit 0
Modified: trunk/debathena/meta/extra-software/debian/rules
===================================================================
--- trunk/debathena/meta/extra-software/debian/rules 2012-07-03 15:44:50 UTC (rev 25609)
+++ trunk/debathena/meta/extra-software/debian/rules 2012-07-03 17:56:10 UTC (rev 25610)
@@ -3,6 +3,8 @@
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)
+include /usr/share/cdbs/1/rules/debhelper.mk
+
ifeq ($(HAVE_ICEDTEA),y)
binary-predeb/debathena-extra-software::
echo "debathena-java-plugin=icedtea6-plugin" >> debian/debathena-extra-software.substvars
@@ -18,4 +20,3 @@
echo "debathena-cool-kids-office-suite=openoffice.org" >> debian/debathena-extra-software.substvars
endif
-include /usr/share/cdbs/1/rules/debhelper.mk
