diff options
| author |  Jonathan D Reed <jdreed@mit.edu> | 2012-07-03 17:56:10 +0000 |
|---|---|---|
| committer | Jonathan D Reed <jdreed@mit.edu> | 2012-07-03 17:56:10 +0000 |
| commit | 94697bbab1f415a6caaa733a0dc64e475da5c477 (patch) | |
| tree | ff6b16f64a4c7567f05c063739e7e4c1c473dd29 | |
| parent | 2217ed5f9364178c0a7845709439ad361935d87d (diff) | |
In extra-software:
* include debhelper.mk before adding to the targets, not after.
* Don't tell people to run "soffice", that's just stupid.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | debian/ooffice | 4 | ||||
| -rwxr-xr-x | 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 <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 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 <<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 diff --git a/debian/rules b/debian/rules index 6f744a4..a36b0b0 100755 --- a/debian/rules +++ b/debian/rules @@ -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 @@ else echo "debathena-cool-kids-office-suite=openoffice.org" >> debian/debathena-extra-software.substvars endif -include /usr/share/cdbs/1/rules/debhelper.mk |