Control: tag -1 + patch

On Thu, 26 Jun 2014 21:01:01 +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:
> 
>   cp /«PKGBUILDDIR»/blib/man5/* /«PKGBUILDDIR»/debian/razor/usr/share/man/man5
>   cp /«PKGBUILDDIR»/debian/razor-client.1p 
> /«PKGBUILDDIR»/debian/razor/usr/share/man/man1
>   mv /«PKGBUILDDIR»/debian/razor/usr/lib/perl5/Razor2/* 
> /«PKGBUILDDIR»/debian/razor/usr/share/perl5/Razor2/
>   mv: cannot stat '/«PKGBUILDDIR»/debian/razor/usr/lib/perl5/Razor2/*': No 
> such file or directory
>   make: *** [install] Error 1
>   debian/rules:32: recipe for target 'install' failed

Attached is a patch which uses $Config{vendorarch} 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
   `-   NP: The Dubliners: Spancill Hill
diff -u razor-2.85/debian/rules razor-2.85/debian/rules
--- razor-2.85/debian/rules
+++ razor-2.85/debian/rules
@@ -7,6 +7,8 @@
 
 include /usr/share/quilt/quilt.make
 
+ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -42,8 +44,8 @@
 	echo "logfile = /var/log/razor-agent.log" >> $(CURDIR)/debian/razor/etc/razor/razor-agent.conf
 	cp $(CURDIR)/blib/man5/* $(CURDIR)/debian/razor/usr/share/man/man5
 	cp $(CURDIR)/debian/razor-client.1p $(CURDIR)/debian/razor/usr/share/man/man1
-	mv $(CURDIR)/debian/razor/usr/lib/perl5/Razor2/* $(CURDIR)/debian/razor/usr/share/perl5/Razor2/
-	rmdir $(CURDIR)/debian/razor/usr/lib/perl5/Razor2
+	mv $(CURDIR)/debian/razor/$(ARCHLIB)/Razor2/* $(CURDIR)/debian/razor/usr/share/perl5/Razor2/
+	rmdir $(CURDIR)/debian/razor/$(ARCHLIB)/Razor2
 
 binary-indep: build install
 
diff -u razor-2.85/debian/changelog razor-2.85/debian/changelog
--- razor-2.85/debian/changelog
+++ razor-2.85/debian/changelog
@@ -1,3 +1,13 @@
+razor (1:2.85-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "hardcodes /usr/lib/perl5":
+    set perl library directory in debian/rules, using the value of
+    $Config{vendorarch}
+    (Closes: #752810)
+
+ -- gregor herrmann <gre...@debian.org>  Sun, 06 Jul 2014 17:06:38 +0200
+
 razor (1:2.85-4) unstable; urgency=low
 
   * [7e80fb6] Add use-Digest-SHA.patch to use Digest::SHA instead of

Attachment: signature.asc
Description: Digital Signature

Reply via email to