Control: tag -1 + patch On Thu, 26 Jun 2014 20:03:25 +0300, Niko Tyni wrote:
> For this to work, packages containing binary perl modules need to migrate
> from using the hardcoded /usr/lib/perl5 directory to the value of the
> $Config{vendorarch} variable, as defined in the 'Config' module.
>
> This package fails to build with perl_5.20.0-1 from experimental:
>
> dh_install --sourcedir=debian/tmp --autodest --fail-missing -X.la
> dh_install: libobexftp-perl missing files (usr/lib/perl5/*), aborting
> make: *** [binary-arch] Error 2
>
> One solution for this might be an executable debhelper install file
> (available with debhelper compat level 9) expanding $Config{vendorarch}.
> See #751924 for an example of this.
I'm attaching a patch which uses a .install.in file and a
substitution from d/rules.
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: Bruce Springsteen: My City of Ruins
diff -u obexftp-0.23/debian/changelog obexftp-0.23/debian/changelog
--- obexftp-0.23/debian/changelog
+++ obexftp-0.23/debian/changelog
@@ -1,3 +1,12 @@
+obexftp (0.23-3) UNRELEASED; urgency=medium
+
+ * QA upload.
+ * Fix "hardcodes /usr/lib/perl5":
+ dynamically set perl library path in debian/rules from $Config{vendorarch}
+ (Closes: #752799)
+
+ -- gregor herrmann <gre...@debian.org> Sat, 05 Jul 2014 22:29:35 +0200
+
obexftp (0.23-2) unstable; urgency=medium
* QA upload.
reverted:
--- obexftp-0.23/debian/libobexftp-perl.install
+++ obexftp-0.23.orig/debian/libobexftp-perl.install
@@ -1 +0,0 @@
-usr/lib/perl5/*
diff -u obexftp-0.23/debian/rules obexftp-0.23/debian/rules
--- obexftp-0.23/debian/rules
+++ obexftp-0.23/debian/rules
@@ -63,6 +63,8 @@
CROSS= --build $(DEB_BUILD_GNU_TYPE)
endif
+PERL_ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
+
include /usr/share/quilt/quilt.make
config.status: configure $(QUILT_STAMPFN)
@@ -86,6 +88,7 @@
rm -f build-stamp
debian/rules unpatch
rm -rf doc/api
+ rm -f debian/libobexftp-perl.install
$(MAKE) -C doc clean || true
$(MAKE) distclean || true
rm -f swig/python/__init__.py[co]
@@ -107,6 +110,7 @@
binary-arch: build install
dh_testdir
dh_testroot
+ sed -e 's;@PERL_ARCHLIB@;$(PERL_ARCHLIB);g;' $(CURDIR)/debian/libobexftp-perl.install.in > $(CURDIR)/debian/libobexftp-perl.install
dh_install --sourcedir=debian/tmp --autodest --fail-missing -X.la
dh_installdocs -XCOPYING -XINSTALL -Xobexftp.1
dh_installman
@@ -118,7 +122,7 @@
dh_strip
ifeq ($(COMPILE_PERL_BINDING),yes)
- find $(CURDIR)/debian/*/usr/lib/perl5 -name *.so -type f -exec chrpath -d {} \;
+ find $(CURDIR)/debian/*/$(PERL_ARCHLIB) -name *.so -type f -exec chrpath -d {} \;
#run it again to make sure that permissions are correct
dh_fixperms
dh_perl -plibobexftp-perl
only in patch2:
unchanged:
--- obexftp-0.23.orig/debian/libobexftp-perl.install.in
+++ obexftp-0.23/debian/libobexftp-perl.install.in
@@ -0,0 +1 @@
+@PERL_ARCHLIB@/*
signature.asc
Description: Digital Signature
