Control: tag -1 + patch

On Tue, 24 Jun 2014 00:01:01 +0300, Niko Tyni wrote:

> This package fails to build with perl_5.20.0-1 from experimental:
> 
>      debian/rules override_dh_install
>   make[1]: Entering directory '/«PKGBUILDDIR»'
>   dh_install --fail-missing -Xusr/bin/hsclient
>   dh_install: libnet-handlersocket-perl missing files (usr/lib/perl5/*), 
> aborting
>   make[1]: *** [override_dh_install] Error 2
>   debian/rules:32: recipe for target 'override_dh_install' failed
>   make[1]: Leaving directory '/«PKGBUILDDIR»'
>   make: *** [binary-arch] Error 2

Attached is a patch using $Config{vendorarch} and a
d/libnet-handlersocket-perl.install.in file.

(Executable .install + debhelper 9 breaks other things.)

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 -Nru handlersocket-1.1.0-7-g1044a28/debian/changelog handlersocket-1.1.0-7-g1044a28/debian/changelog
--- handlersocket-1.1.0-7-g1044a28/debian/changelog	2013-08-22 17:09:59.000000000 +0200
+++ handlersocket-1.1.0-7-g1044a28/debian/changelog	2014-07-04 17:16:29.000000000 +0200
@@ -1,3 +1,14 @@
+handlersocket (1.1.0-7-g1044a28-1.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "hardcodes /usr/lib/perl5":
+    create d/libnet-handlersocket-perl.install from
+    d/libnet-handlersocket-perl.install.in in debian/rules, using the current
+    value of $Config{vendorarch}
+    (Closes: #752476)
+
+ -- gregor herrmann <gre...@debian.org>  Fri, 04 Jul 2014 17:09:49 +0200
+
 handlersocket (1.1.0-7-g1044a28-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru handlersocket-1.1.0-7-g1044a28/debian/libnet-handlersocket-perl.install handlersocket-1.1.0-7-g1044a28/debian/libnet-handlersocket-perl.install
--- handlersocket-1.1.0-7-g1044a28/debian/libnet-handlersocket-perl.install	2012-05-26 20:03:02.000000000 +0200
+++ handlersocket-1.1.0-7-g1044a28/debian/libnet-handlersocket-perl.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/share/man/man3/Net::HandlerSocket.3pm
-usr/lib/perl5/*
diff -Nru handlersocket-1.1.0-7-g1044a28/debian/libnet-handlersocket-perl.install.in handlersocket-1.1.0-7-g1044a28/debian/libnet-handlersocket-perl.install.in
--- handlersocket-1.1.0-7-g1044a28/debian/libnet-handlersocket-perl.install.in	1970-01-01 01:00:00.000000000 +0100
+++ handlersocket-1.1.0-7-g1044a28/debian/libnet-handlersocket-perl.install.in	2014-07-04 17:12:54.000000000 +0200
@@ -0,0 +1,2 @@
+usr/share/man/man3/Net::HandlerSocket.3pm
+@PERLARCHLIB@
diff -Nru handlersocket-1.1.0-7-g1044a28/debian/rules handlersocket-1.1.0-7-g1044a28/debian/rules
--- handlersocket-1.1.0-7-g1044a28/debian/rules	2012-05-26 20:03:02.000000000 +0200
+++ handlersocket-1.1.0-7-g1044a28/debian/rules	2014-07-04 17:14:19.000000000 +0200
@@ -4,6 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+PERLARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
+
 %:
 	dh --with=autoreconf $@ 
 
@@ -29,6 +31,7 @@
 	cd perl-Net-HandlerSocket && dh_auto_install
 
 override_dh_install:
+	sed -e 's,@PERLARCHLIB@,$(PERLARCHLIB),g' debian/libnet-handlersocket-perl.install.in > debian/libnet-handlersocket-perl.install
 	dh_install --fail-missing -Xusr/bin/hsclient
 	# Ensure that dependency_libs=''
 	@if ! grep -q "^dependency_libs=''$$" debian/libhsclient-dev/usr/lib/libhsclient.la ; then \
@@ -40,6 +43,7 @@
 override_dh_clean:
 	rm -f perl-Net-HandlerSocket/debian
 	rm -rf debian/mysql-source-5.5
+	rm -f debian/libnet-handlersocket-perl.install
 	dh_clean
 
 override_dh_makeshlibs:

Attachment: signature.asc
Description: Digital Signature

Reply via email to