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/rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/rules') 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 -- cgit v1.2.3