[SCM] din/master: Apply fix to data/Makefile.am to make it work correctly with dh_auto_install (Closes: #718165). Also fix some minor issues in debian/rules.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e8f554beb47548c4acc668ef8ad9d135f2e42072
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Oct 6 13:07:58 2013 +0100

    Apply fix to data/Makefile.am to make it work correctly with dh_auto_install (Closes: #718165).
    Also fix some minor issues in debian/rules.

diff --git a/debian/patches/fix-data-Makefile.patch b/debian/patches/fix-data-Makefile.patch
new file mode 100644
index 0000000..9a65708
--- /dev/null
+++ b/debian/patches/fix-data-Makefile.patch
@@ -0,0 +1,14 @@
+---
+ data/Makefile.am |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- din.orig/data/Makefile.am
++++ din/data/Makefile.am
+@@ -145,5 +145,5 @@ $(dinbin_DATA): $(dinbin_DATA).in
+ 
+ EXTRA_DIST = $(dindata_DATA) $(dindesk_DATA) $(dinicon_DATA) $(dinbin_DATA)
+ 
+-install-data-hook: ${DESTDIR}/$(prefix)/bin/checkdotdin
+-	chmod +x $^
++install-data-hook:
++	chmod +x ${DESTDIR}/${dinbindir}/checkdotdin
diff --git a/debian/patches/series b/debian/patches/series
index 1e185c8..0388331 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 checkdotdin-fix.patch
+fix-data-Makefile.patch
diff --git a/debian/rules b/debian/rules
index 1ec026f..7f227c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,8 @@
 override_dh_installman:
 	dh_installman debian/din.1
 
-override_dh_install:
-	dh_install
+override_dh_fixperms:
+	dh_fixperms
 	chmod a+x debian/din/usr/share/din/m00
 
 override_dh_auto_build:

-- 
din packaging