Remove dependencies on dh-exec and dpkg-dev.
* Use alternative way of installing icons to remove dependency on dh-exec. * Drop redundant dependency on dpkg-dev.
This commit is contained in:
3
debian/changelog
vendored
3
debian/changelog
vendored
@@ -7,6 +7,9 @@ dvdisaster (0.79.5-4) UNRELEASED; urgency=medium
|
|||||||
dpkg-parsechangelog.
|
dpkg-parsechangelog.
|
||||||
* Call ./configure script directly, instead of relying on debhelper,
|
* Call ./configure script directly, instead of relying on debhelper,
|
||||||
to resolve incompatibilities with Bash-based script.
|
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 <e7appew@gmail.com> Mon, 14 Aug 2017 23:04:38 +1000
|
-- Carlos Maddela <e7appew@gmail.com> Mon, 14 Aug 2017 23:04:38 +1000
|
||||||
|
|
||||||
|
|||||||
2
debian/control
vendored
2
debian/control
vendored
@@ -6,8 +6,6 @@ Uploaders: TANIGUCHI Takaki <takaki@debian.org>,
|
|||||||
Rogério Brito <rbrito@ime.usp.br>,
|
Rogério Brito <rbrito@ime.usp.br>,
|
||||||
Carlos Maddela <e7appew@gmail.com>
|
Carlos Maddela <e7appew@gmail.com>
|
||||||
Build-Depends: debhelper (>= 10),
|
Build-Depends: debhelper (>= 10),
|
||||||
dh-exec,
|
|
||||||
dpkg-dev (>= 1.16.1.1),
|
|
||||||
gettext,
|
gettext,
|
||||||
libbz2-dev,
|
libbz2-dev,
|
||||||
libcam-dev [kfreebsd-any],
|
libcam-dev [kfreebsd-any],
|
||||||
|
|||||||
9
debian/dvdisaster.install
vendored
Executable file → Normal file
9
debian/dvdisaster.install
vendored
Executable file → Normal file
@@ -1,10 +1,5 @@
|
|||||||
#!/usr/bin/dh-exec
|
contrib/dvdisaster.desktop usr/share/applications
|
||||||
usr/bin
|
usr/bin
|
||||||
|
usr/share/icons
|
||||||
usr/share/locale
|
usr/share/locale
|
||||||
usr/share/man
|
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
|
|
||||||
|
|||||||
12
debian/rules
vendored
12
debian/rules
vendored
@@ -13,6 +13,10 @@ export FORCE_SOURCE_DATE = 1
|
|||||||
MUTABLE_FILES := build.h $(wildcard locale/*.po) \
|
MUTABLE_FILES := build.h $(wildcard locale/*.po) \
|
||||||
documentation/config/version.tex
|
documentation/config/version.tex
|
||||||
|
|
||||||
|
BUILDROOT := $(CURDIR)/debian/tmp
|
||||||
|
ICONS := $(wildcard contrib/dvdisaster*.png)
|
||||||
|
ICON_SIZES := $(patsubst contrib/dvdisaster%.png,%,$(ICONS))
|
||||||
|
|
||||||
%:
|
%:
|
||||||
dh $@
|
dh $@
|
||||||
|
|
||||||
@@ -50,7 +54,13 @@ override_dh_auto_build-indep:
|
|||||||
true
|
true
|
||||||
|
|
||||||
override_dh_auto_install-arch:
|
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:
|
override_dh_auto_install-indep:
|
||||||
true
|
true
|
||||||
|
|||||||
Reference in New Issue
Block a user