Control: tag -1 + patch On Wed, 25 Jun 2014 23:41:04 +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.
Done in the attached patch in debian/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
`-
diff -u lockdev-1.0.3/debian/changelog lockdev-1.0.3/debian/changelog
--- lockdev-1.0.3/debian/changelog
+++ lockdev-1.0.3/debian/changelog
@@ -1,3 +1,14 @@
+lockdev (1.0.3-1.6) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix "hardcodes /usr/lib/perl5":
+ debian/rules:
+ - use $Config{vendorarch} for getting correct directory
+ - revamp install target for perl library
+ (Closes: #752714)
+
+ -- gregor herrmann <[email protected]> Sat, 05 Jul 2014 21:36:52 +0200
+
lockdev (1.0.3-1.5) unstable; urgency=low
* Non-maintainer upload.
diff -u lockdev-1.0.3/debian/rules lockdev-1.0.3/debian/rules
--- lockdev-1.0.3/debian/rules
+++ lockdev-1.0.3/debian/rules
@@ -6,19 +6,7 @@
#export DH_VERBOSE=1
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-archlib = `$(PERL) -MConfig -e 'print $$Config{installarchlib}'`
-config = INSTALLDIRS=vendor
-config += INSTALLMAN1DIR=${d_man}/man1
-config += INSTALLMAN3DIR=${d_man}/man3
-config += INSTALLPRIVLIB=${d_ulib}/perl5
-config += INSTALLARCHLIB=${d_build}$(archlib)
-PERLVERSION=`$(PERL) -MConfig -e 'print $$Config{version}'`
-
-
+PERL_ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
CFLAGS = -Wall -g
@@ -78,9 +66,9 @@
$(MAKE) install_debug basedir=$(CURDIR)/debian/liblockdev1-dbg/usr
$(MAKE) install_profile basedir=$(CURDIR)/debian/liblockdev1-dbg/usr
$(MAKE) install_dev basedir=$(CURDIR)/debian/liblockdev1-dev/usr
- cd LockDev && $(MAKE) pure_install $(config) PREFIX=$(CURDIR)/debian/liblockdev1-perl/usr
+ cd LockDev && $(MAKE) install PREFIX=/usr DESTDIR=$(CURDIR)/debian/liblockdev1-perl
- mv $(CURDIR)/debian/liblockdev1-perl/usr/lib/perl5/LockDev.pm \
+ mv $(CURDIR)/debian/liblockdev1-perl$(PERL_ARCHLIB)/LockDev.pm \
$(CURDIR)/debian/liblockdev1-perl/usr/share/perl5
ln -s lockdev.3.gz \
signature.asc
Description: Digital Signature
