Control: tag -1 + patch

On Wed, 25 Jun 2014 23:37:47 +0300, Niko Tyni wrote:

> This package fails to build with perl_5.20.0-1 from experimental:
> 
>   dh_install -a
>   cp: cannot stat 'debian/tmp/usr/lib/perl5': No such file or directory
>   dh_install: cp -a debian/tmp/usr/lib/perl5 
> debian/libmail-spf-xs-perl//usr/lib/ returned exit code 1
>   make: *** [binary-arch] Error 2
>   debian/rules:63: recipe for target 'binary-arch' failed
> 
> One solution for this might be an executable debhelper install file
> (available with debhelper compat level 9) expanding $Config{vendorarch}.

I chose a different way now, with calling dh_install with dynamically
expanded paths. debdiff attached.

Cheers,
gregor

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Joan Baez: Don't cry for me argentina
diff -Nru libspf2-1.2.10/debian/changelog libspf2-1.2.10/debian/changelog
--- libspf2-1.2.10/debian/changelog	2014-02-01 14:52:12.000000000 +0100
+++ libspf2-1.2.10/debian/changelog	2014-07-04 18:16:03.000000000 +0200
@@ -1,3 +1,14 @@
+libspf2 (1.2.10-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "hardcodes /usr/lib/perl5":
+    - drop debian/libmail-spf-xs-perl.install
+    - call dh_install with dynamically expanded directory in debian/rules,
+      using $Config{vendorarch}
+    (Closes: #752712)
+
+ -- gregor herrmann <[email protected]>  Fri, 04 Jul 2014 18:00:17 +0200
+
 libspf2 (1.2.10-3) unstable; urgency=low
 
   * Merge changes from Ubuntu (Closes: #734224).
diff -Nru libspf2-1.2.10/debian/libmail-spf-xs-perl.install libspf2-1.2.10/debian/libmail-spf-xs-perl.install
--- libspf2-1.2.10/debian/libmail-spf-xs-perl.install	2013-06-12 23:44:23.000000000 +0200
+++ libspf2-1.2.10/debian/libmail-spf-xs-perl.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/perl5
-usr/share/man/man3/*.3pm
diff -Nru libspf2-1.2.10/debian/rules libspf2-1.2.10/debian/rules
--- libspf2-1.2.10/debian/rules	2014-01-25 22:21:07.000000000 +0100
+++ libspf2-1.2.10/debian/rules	2014-07-04 18:13:16.000000000 +0200
@@ -16,6 +16,7 @@
 CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 perlld := $(shell perl -MConfig -e 'print $$Config{ld}')
+perlarchlib := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
 
 DEB_LDFLAGS_MAINT_APPEND = -Wl,--version-script=$(CURDIR)/debian/libspf2.ver
 buildflags += $(shell DEB_LDFLAGS_MAINT_APPEND="$(DEB_LDFLAGS_MAINT_APPEND)" \
@@ -62,7 +63,8 @@
 binary-arch: install
 	dh_testdir
 	dh_testroot
-	dh_install -a
+	dh_install -a -Nlibmail-spf-xs-perl
+	dh_install -plibmail-spf-xs-perl --autodest $(perlarchlib) usr/share/man/man3/*.3pm
 #	Rename the `spfquery` tool for the alternatives system:
 	mv debian/spfquery/usr/bin/spfquery debian/spfquery/usr/bin/spfquery.$(SOURCE_PACKAGE)
 	mv debian/spfquery/usr/sbin/spfd debian/spfquery/usr/sbin/spfd.$(SOURCE_PACKAGE)

Attachment: signature.asc
Description: Digital Signature

Reply via email to