Control: tags 718165 patch pending
Hi,
The issue was much more complex that it had appeared initially. The problem is
with how dh_auto_install works (I guess something changed recently). To check
if it should call make install, it first tries a dry run of the make install
command, and due to the way the Makefile.am is done, the dry run fails, even if
the real one would succeed.
I have now prepared a patch that fixes data/Makefile.am.
I have left the other fix in, since I believe the chmod should be done in
dh_fixperms, not dh_install.
I'm attaching here the revised patch, and will upload the NMU to the 7 day
delayed queue.
--
Regards,
Marga
diff -Nru din-5.2.1/debian/changelog din-5.2.1/debian/changelog
--- din-5.2.1/debian/changelog 2013-04-20 19:38:12.000000000 +0000
+++ din-5.2.1/debian/changelog 2013-08-09 12:48:47.000000000 +0000
@@ -1,3 +1,12 @@
+din (5.2.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * 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.
+
+ -- Margarita Manterola <ma...@debian.org> Fri, 09 Aug 2013 07:56:00 +0000
+
din (5.2.1-1) unstable; urgency=low
* New upstream release.
diff -Nru din-5.2.1/debian/patches/fix-data-Makefile.patch din-5.2.1/debian/patches/fix-data-Makefile.patch
--- din-5.2.1/debian/patches/fix-data-Makefile.patch 1970-01-01 00:00:00.000000000 +0000
+++ din-5.2.1/debian/patches/fix-data-Makefile.patch 2013-08-09 12:47:54.000000000 +0000
@@ -0,0 +1,12 @@
+Index: din-5.2.1/data/Makefile.am
+===================================================================
+--- din-5.2.1.orig/data/Makefile.am 2013-03-20 12:03:03.000000000 +0000
++++ din-5.2.1/data/Makefile.am 2013-08-09 12:47:13.603735342 +0000
+@@ -145,5 +145,5 @@
+
+ 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 -Nru din-5.2.1/debian/patches/series din-5.2.1/debian/patches/series
--- din-5.2.1/debian/patches/series 2013-03-09 19:29:48.000000000 +0000
+++ din-5.2.1/debian/patches/series 2013-08-09 12:46:24.000000000 +0000
@@ -1 +1,2 @@
checkdotdin-fix.patch
+fix-data-Makefile.patch
diff -Nru din-5.2.1/debian/rules din-5.2.1/debian/rules
--- din-5.2.1/debian/rules 2013-03-13 13:04:32.000000000 +0000
+++ din-5.2.1/debian/rules 2013-08-09 12:47:29.000000000 +0000
@@ -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:
