From 94697bbab1f415a6caaa733a0dc64e475da5c477 Mon Sep 17 00:00:00 2001 From: Jonathan D Reed Date: Tue, 3 Jul 2012 17:56:10 +0000 Subject: In extra-software: * include debhelper.mk before adding to the targets, not after. * Don't tell people to run "soffice", that's just stupid. --- debian/changelog | 7 +++++++ debian/ooffice | 4 ++-- debian/rules | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0714c13..4b2c983 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 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 diff --git a/debian/ooffice b/debian/ooffice index e6f6d2f..dc1be39 100755 --- a/debian/ooffice +++ b/debian/ooffice @@ -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 @@ else cat </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 @@ else echo "debathena-cool-kids-office-suite=openoffice.org" >> debian/debathena-extra-software.substvars endif -include /usr/share/cdbs/1/rules/debhelper.mk -- cgit v1.2.3