[Pkg-opt-media-team] [dvdisaster] 14/61: Fix installation of desktop file and icon images.

[Takaki Taniguchi]

This is an automated email from the git hooks/post-receive script.

takaki pushed a commit to branch master
in repository dvdisaster.

commit f2faa26920519f861d3ba5f3f691b173e4d96250
Author: Carlos Maddela <e7appew at gmail.com>
Date:   Mon Dec 19 04:07:39 2016 +1100

    Fix installation of desktop file and icon images.
---
 debian/control            |  1 +
 debian/dvdisaster.install |  7 +++++++
 debian/rules              | 14 ++------------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index b053713..3410916 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Optical Media Tools Team <pkg-opt-media-team at lists.alioth.debian.org
 Uploaders: TANIGUCHI Takaki <takaki at debian.org>,
            Rogério Brito <rbrito at ime.usp.br>
 Build-Depends: debhelper (>= 9),
+               dh-exec,
                dpkg-dev (>= 1.16.1.1),
                gettext,
                libbz2-dev,
diff --git a/debian/dvdisaster.install b/debian/dvdisaster.install
old mode 100644
new mode 100755
index a79b820..303dfb8
--- a/debian/dvdisaster.install
+++ b/debian/dvdisaster.install
@@ -1,3 +1,10 @@
+#!/usr/bin/dh-exec
 usr/bin
 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 1e6b633..84c82d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,20 +17,10 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		--localedir=\$${prefix}/share/locale \
 		--docdir=\$${prefix}share/doc \
-		--docsubdir=dvdisaster-doc/html 
+		--docsubdir=dvdisaster-doc/html
 
 override_dh_auto_install:
-	dh_auto_install -- BUILDROOT=$(CURDIR)/debian/tmp 
-
-	# Installing desktop file
-	install -D -m 0644 contrib/dvdisaster.desktop debian/dvdisaster/usr/share/applications/dvdisaster.desktop
-	sed -i -e 's/dvdisaster48/dvdisaster/' debian/dvdisaster/usr/share/applications/dvdisaster.desktop
-
-	# Installing icon
-	install -D -m 0644 contrib/dvdisaster32.png debian/dvdisaster/usr/share/icons/dvdisaster.png
-
-	# Installing pixmaps
-	install -D -m 0644 debian/pixmaps/dvdisaster.xpm debian/dvdisaster/usr/share/pixmaps/dvdisaster.xpm
+	dh_auto_install -- BUILDROOT=$(CURDIR)/debian/tmp
 
 	# Removing double files
 	rm -f debian/tmp/usr/bin/dvdisaster-uninstall.sh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opt-media/dvdisaster.git