Control: tag -i + patch On Thu, 26 Jun 2014 20:00:33 +0300, Niko Tyni wrote:
> This package fails to build with perl_5.20.0-1 from experimental:
>
> dh_install -a
> cp -a ./debian/build-full/objs/nginx debian/nginx-full/usr/sbin/
> cp -a ./debian/build-light/objs/nginx debian/nginx-light/usr/sbin/
> cp -a ./debian/build-extras/objs/nginx debian/nginx-extras/usr/sbin/
> cp -a
> debian/tmp/debian/build-extras/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.bs
> debian/nginx-extras/usr/lib/perl5/auto/nginx/
> cp: cannot stat
> 'debian/tmp/debian/build-extras/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.bs':
> No such file or directory
> dh_install: cp -a
> debian/tmp/debian/build-extras/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.bs
> debian/nginx-extras/usr/lib/perl5/auto/nginx/ returned exit code 1
> 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}.
Here's a patch that uses an executable .install file.
(Yay for modern packaging!)
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: Bettina Wegner: der prinz ist gegangen
diff -Nru nginx-1.6.0/debian/changelog nginx-1.6.0/debian/changelog
--- nginx-1.6.0/debian/changelog 2014-04-24 18:23:46.000000000 +0200
+++ nginx-1.6.0/debian/changelog 2014-07-05 22:15:39.000000000 +0200
@@ -1,3 +1,15 @@
+nginx (1.6.0-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix "hardcodes /usr/lib/perl5":
+ - drop debian/nginx-extras.dirs, not needed, dh_install uses the
+ directories from debian/nginx-extras.install
+ - make debian/nginx-extras.install executable, and use $Config{vendorarch}
+ for the perl library path there
+ (Closes: #752796)
+
+ -- gregor herrmann <gre...@debian.org> Sat, 05 Jul 2014 21:56:44 +0200
+
nginx (1.6.0-1) unstable; urgency=medium
[ Christos Trochalakis ]
diff -Nru nginx-1.6.0/debian/nginx-extras.dirs nginx-1.6.0/debian/nginx-extras.dirs
--- nginx-1.6.0/debian/nginx-extras.dirs 2014-04-24 18:23:46.000000000 +0200
+++ nginx-1.6.0/debian/nginx-extras.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/sbin
-usr/lib/perl5/auto/nginx
diff -Nru nginx-1.6.0/debian/nginx-extras.install nginx-1.6.0/debian/nginx-extras.install
--- nginx-1.6.0/debian/nginx-extras.install 2014-04-24 18:23:46.000000000 +0200
+++ nginx-1.6.0/debian/nginx-extras.install 2014-07-05 22:05:01.000000000 +0200
@@ -1,4 +1,9 @@
-debian/build-extras/objs/nginx usr/sbin
-debian/build-extras/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.bs usr/lib/perl5/auto/nginx
-debian/build-extras/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so usr/lib/perl5/auto/nginx
-debian/build-extras/objs/src/http/modules/perl/blib/lib/nginx.pm usr/lib/perl5
+#!/usr/bin/perl -w
+
+use Config;
+
+my $vendorarch = substr($Config{vendorarch}, 1);
+print "debian/build-extras/objs/src/http/modules/perl/blib/arch/auto/nginx/* $vendorarch/auto/nginx\n";
+print "debian/build-extras/objs/src/http/modules/perl/blib/lib/nginx.pm $vendorarch\n";
+
+print "debian/build-extras/objs/nginx usr/sbin\n";
signature.asc
Description: Digital Signature
