From 12881d396796709fc93f0d327b9e013706f1a8e8 Mon Sep 17 00:00:00 2001 From: Jonathan D Reed Date: Tue, 19 Mar 2013 19:56:07 +0000 Subject: In extra-software: * Recommend motif-clients (Trac: #946) * Convert from CDBS to dh7 * Remove X-Debathena-Nobuild line now that hardy isn't a thing * Explicitly depend on icedtea6-plugin, as there are no releases without it anymore. * Bump Standards-Version to 3.9.3 * Change copyright file to new copyright format --- debian/rules | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index a36b0b0..2726fd3 100755 --- a/debian/rules +++ b/debian/rules @@ -1,22 +1,20 @@ #!/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) +%: + dh $@ -include /usr/share/cdbs/1/rules/debhelper.mk +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 +override_dh_gencontrol: +ifeq ($(HAVE_LIBREOFFICE),y) + dh_gencontrol -- -Vdebathena-cool-kids-office-suite=libreoffice +else + dh_gencontrol -- -Vdebathena-cool-kids-office-suite=openoffice.org endif ifeq ($(HAVE_LIBREOFFICE),y) - install/debathena-extra-software:: +override_dh_install: + dh_install 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 -- cgit v1.2.3