diff --git a/debian/changelog b/debian/changelog index 4dc4499..0e4ca8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ dvdisaster (0.79.5-4) UNRELEASED; urgency=medium dpkg-parsechangelog. * Call ./configure script directly, instead of relying on debhelper, to resolve incompatibilities with Bash-based script. + * Use alternative way of installing icons to remove dependency on + dh-exec. + * Drop redundant dependency on dpkg-dev. -- Carlos Maddela Mon, 14 Aug 2017 23:04:38 +1000 diff --git a/debian/control b/debian/control index 59d4b40..60f886c 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,6 @@ Uploaders: TANIGUCHI Takaki , Rogério Brito , Carlos Maddela Build-Depends: debhelper (>= 10), - dh-exec, - dpkg-dev (>= 1.16.1.1), gettext, libbz2-dev, libcam-dev [kfreebsd-any], diff --git a/debian/dvdisaster.install b/debian/dvdisaster.install old mode 100755 new mode 100644 index 303dfb8..ae9e496 --- a/debian/dvdisaster.install +++ b/debian/dvdisaster.install @@ -1,10 +1,5 @@ -#!/usr/bin/dh-exec +contrib/dvdisaster.desktop usr/share/applications usr/bin +usr/share/icons usr/share/locale usr/share/man -contrib/dvdisaster.desktop usr/share/applications -contrib/dvdisaster16.png => usr/share/icons/hicolor/16x16/apps/dvdisaster.png -contrib/dvdisaster24.png => usr/share/icons/hicolor/24x24/apps/dvdisaster.png -contrib/dvdisaster32.png => usr/share/icons/hicolor/32x32/apps/dvdisaster.png -contrib/dvdisaster48.png => usr/share/icons/hicolor/48x48/apps/dvdisaster.png -contrib/dvdisaster64.png => usr/share/icons/hicolor/64x64/apps/dvdisaster.png diff --git a/debian/rules b/debian/rules index 5d08cc7..4e176dd 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,10 @@ export FORCE_SOURCE_DATE = 1 MUTABLE_FILES := build.h $(wildcard locale/*.po) \ documentation/config/version.tex +BUILDROOT := $(CURDIR)/debian/tmp +ICONS := $(wildcard contrib/dvdisaster*.png) +ICON_SIZES := $(patsubst contrib/dvdisaster%.png,%,$(ICONS)) + %: dh $@ @@ -50,7 +54,13 @@ override_dh_auto_build-indep: true override_dh_auto_install-arch: - dh_auto_install -a -- BUILDROOT=$(CURDIR)/debian/tmp + dh_auto_install -a -- BUILDROOT=$(BUILDROOT) + set -e; \ + for S in $(ICON_SIZES); do \ + D="$(BUILDROOT)/usr/share/icons/hicolor/$${S}x$${S}/apps"; \ + install -d "$${D}"; \ + install -T "contrib/dvdisaster$${S}.png" "$${D}/dvdisaster.png"; \ + done override_dh_auto_install-indep: true