Control: tag -1 + patch

On Mon, 23 Jun 2014 23:47:45 +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.

Attached is a patch implementing this:

+  * Fix "hardcodes /usr/lib/perl5":
+    - Make debian/libgenders-perl.install executable, and use
+      $Config{vendorarch}.
+    - Use $Config{vendorarch} in debian/rules as well.
+    (Closes: #752474)


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: Johnny Cash: First Time Ever I Saw Your Face
diff -Nru genders-1.20/debian/changelog genders-1.20/debian/changelog
--- genders-1.20/debian/changelog	2013-05-05 06:24:10.000000000 +0200
+++ genders-1.20/debian/changelog	2014-07-01 18:30:17.000000000 +0200
@@ -1,3 +1,14 @@
+genders (1.20-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "hardcodes /usr/lib/perl5":
+    - Make debian/libgenders-perl.install executable, and use
+      $Config{vendorarch}.
+    - Use $Config{vendorarch} in debian/rules as well.
+    (Closes: #752474)
+
+ -- gregor herrmann <gre...@debian.org>  Tue, 01 Jul 2014 18:19:44 +0200
+
 genders (1.20-1) unstable; urgency=low
 
   * New upstream version.
diff -Nru genders-1.20/debian/libgenders-perl.install genders-1.20/debian/libgenders-perl.install
--- genders-1.20/debian/libgenders-perl.install	2012-05-03 03:43:35.000000000 +0200
+++ genders-1.20/debian/libgenders-perl.install	2014-07-01 18:25:52.000000000 +0200
@@ -1,9 +1,10 @@
-usr/lib/perl5
-usr/lib/perl5/auto
-usr/lib/perl5/auto/Libgenders
-usr/lib/perl5/auto/Libgenders/Libgenders.so
-usr/lib/perl5/auto/Libgenders/Libgenders.bs
-usr/lib/perl5/Libgenders.pm
+#!/usr/bin/perl -w
+
+use Config;
+
+print substr($Config{vendorarch}, 1) . "\n";
+
+print <<EOF
 usr/lib/genders/gendlib.pl usr/share/perl5
 usr/lib/genders/hostlist.pl usr/share/perl5
-usr/lib/perl5/Genders.pm
+EOF
diff -Nru genders-1.20/debian/rules genders-1.20/debian/rules
--- genders-1.20/debian/rules	2013-05-06 03:07:30.000000000 +0200
+++ genders-1.20/debian/rules	2014-07-01 18:23:37.000000000 +0200
@@ -31,6 +31,7 @@
 endif
 
 INSTALL_DIR=$(CURDIR)/debian/tmp
+PERL_ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
 
 configure: configure-stamp
 configure-stamp:
@@ -120,7 +121,7 @@
 	dh_fixperms
 	chmod 644 $(CURDIR)/debian/libgenders-perl/usr/share/perl5/gendlib.pl
 	chmod 644 $(CURDIR)/debian/libgenders-perl/usr/share/perl5/hostlist.pl
-	chrpath -d $(CURDIR)/debian/libgenders-perl/usr/lib/perl5/auto/Libgenders/Libgenders.so
+	chrpath -d $(CURDIR)/debian/libgenders-perl$(PERL_ARCHLIB)/auto/Libgenders/Libgenders.so
 	chrpath -d $(CURDIR)/debian/genders/usr/bin/nodeattr
 	dh_perl -plibgenders-perl
 #	dh_python

Attachment: signature.asc
Description: Digital Signature

Reply via email to