Control: tag -1 + patch

On Thu, 26 Jun 2014 20:18:31 +0300, Niko Tyni wrote:

> This package fails to build with perl_5.20.0-1 from experimental:
> 
>   dh_install -Xperllocal.pod --list-missing
>   dh_install: libchemistry-openbabel-perl missing files (usr/lib/perl*), 
> aborting
>   make[1]: *** [override_dh_install] Error 255
>   debian/rules:46: recipe for target 'override_dh_install' failed
>   make[1]: Leaving directory '/«BUILDDIR»/openbabel-2.3.2+dfsg'
>   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}.
> See #751924 for an example of this.

Attached is a patch which passed the value of $Config{vendorarch} to
dh_install 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: Die Quote: Everything's in vain
diff -Nru openbabel-2.3.2+dfsg/debian/changelog openbabel-2.3.2+dfsg/debian/changelog
--- openbabel-2.3.2+dfsg/debian/changelog	2014-01-16 19:06:35.000000000 +0100
+++ openbabel-2.3.2+dfsg/debian/changelog	2014-07-05 22:59:32.000000000 +0200
@@ -1,3 +1,14 @@
+openbabel (2.3.2+dfsg-1.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "hardcodes /usr/lib/perl5":
+    - remove debian/libchemistry-openbabel-perl.install
+    - pass perl directory to dh_install in debian/rules,
+      expanded from $Config{vendorarch}
+    (Closes: #752800)
+
+ -- gregor herrmann <gre...@debian.org>  Sat, 05 Jul 2014 22:39:04 +0200
+
 openbabel (2.3.2+dfsg-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru openbabel-2.3.2+dfsg/debian/libchemistry-openbabel-perl.install openbabel-2.3.2+dfsg/debian/libchemistry-openbabel-perl.install
--- openbabel-2.3.2+dfsg/debian/libchemistry-openbabel-perl.install	2011-04-22 12:10:52.000000000 +0200
+++ openbabel-2.3.2+dfsg/debian/libchemistry-openbabel-perl.install	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/perl*
diff -Nru openbabel-2.3.2+dfsg/debian/rules openbabel-2.3.2+dfsg/debian/rules
--- openbabel-2.3.2+dfsg/debian/rules	2013-05-22 19:06:32.000000000 +0200
+++ openbabel-2.3.2+dfsg/debian/rules	2014-07-05 22:42:07.000000000 +0200
@@ -5,6 +5,7 @@
 -include /usr/share/python/python.mk
 
 PYVERS=$(shell pyversions -vs)
+PERL_ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
 
 export CPPFLAGS     := $(shell dpkg-buildflags --get CPPFLAGS)
 export CFLAGS       := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
@@ -43,7 +44,8 @@
 	done
 
 override_dh_install:
-	dh_install -Xperllocal.pod --list-missing
+	dh_install --list-missing -Nlibchemistry-openbabel-perl
+	dh_install --list-missing -plibchemistry-openbabel-perl -Xperllocal.pod --autodest $(PERL_ARCHLIB)
 
 override_dh_installdocs:
 	dh_installdocs -Xjquery.js

Attachment: signature.asc
Description: Digital Signature

Reply via email to