Control: tag -1 + patch On Thu, 26 Jun 2014 20:58:58 +0300, Niko Tyni wrote:
> from using the hardcoded /usr/lib/perl5 directory to the value of the
> $Config{vendorarch} variable, as defined in the 'Config' module.
[..]
> 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.
I don't know how cdbs and cmake react to debhelper compat 9, so I
tried a slightly experimental different approach with
debian/*.install.in files that are sed'ed during build.
At least the results look good :)
Cheers,
gregor, attaching the patch
--
.''`. 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: Vic Chesnutt: Betty Lonely
diff -Nru qt4-perl-4.10.2/debian/changelog qt4-perl-4.10.2/debian/changelog
--- qt4-perl-4.10.2/debian/changelog 2013-04-13 16:23:25.000000000 +0200
+++ qt4-perl-4.10.2/debian/changelog 2014-07-03 00:28:09.000000000 +0200
@@ -1,3 +1,13 @@
+qt4-perl (4.10.2-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix "hardcodes /usr/lib/perl5":
+ dynamically create debian/*.install files with the correct path from
+ debian/rules during build
+ (Closes: #752809)
+
+ -- gregor herrmann <gre...@debian.org> Wed, 02 Jul 2014 23:52:44 +0200
+
qt4-perl (4.10.2-1) experimental; urgency=low
* New upstream release
diff -Nru qt4-perl-4.10.2/debian/libqtcore4-perl.install qt4-perl-4.10.2/debian/libqtcore4-perl.install
--- qt4-perl-4.10.2/debian/libqtcore4-perl.install 2010-07-07 15:46:05.000000000 +0200
+++ qt4-perl-4.10.2/debian/libqtcore4-perl.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-usr/lib/perl5/auto/QtCore4/QtCore4.so
-usr/lib/perl5/QtCore4/classinfo.pm
-usr/lib/perl5/QtCore4/isa.pm
-usr/lib/perl5/QtCore4/signals.pm
-usr/lib/perl5/QtCore4/debug.pm
-usr/lib/perl5/QtCore4/slots.pm
-usr/lib/perl5/QtCore4.pm
diff -Nru qt4-perl-4.10.2/debian/libqtcore4-perl.install.in qt4-perl-4.10.2/debian/libqtcore4-perl.install.in
--- qt4-perl-4.10.2/debian/libqtcore4-perl.install.in 1970-01-01 01:00:00.000000000 +0100
+++ qt4-perl-4.10.2/debian/libqtcore4-perl.install.in 2014-07-03 00:12:31.000000000 +0200
@@ -0,0 +1,7 @@
+@ARCHLIB@/auto/QtCore4/QtCore4.so
+@ARCHLIB@/QtCore4/classinfo.pm
+@ARCHLIB@/QtCore4/isa.pm
+@ARCHLIB@/QtCore4/signals.pm
+@ARCHLIB@/QtCore4/debug.pm
+@ARCHLIB@/QtCore4/slots.pm
+@ARCHLIB@/QtCore4.pm
diff -Nru qt4-perl-4.10.2/debian/libqtgui4-perl.install qt4-perl-4.10.2/debian/libqtgui4-perl.install
--- qt4-perl-4.10.2/debian/libqtgui4-perl.install 2013-04-07 18:03:47.000000000 +0200
+++ qt4-perl-4.10.2/debian/libqtgui4-perl.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-usr/lib/perl5/QtGui4.pm
-usr/lib/perl5/auto/QtGui4/QtGui4.so
-usr/bin/puic4
-usr/bin/prcc4_bin
diff -Nru qt4-perl-4.10.2/debian/libqtgui4-perl.install.in qt4-perl-4.10.2/debian/libqtgui4-perl.install.in
--- qt4-perl-4.10.2/debian/libqtgui4-perl.install.in 1970-01-01 01:00:00.000000000 +0100
+++ qt4-perl-4.10.2/debian/libqtgui4-perl.install.in 2014-07-03 00:12:31.000000000 +0200
@@ -0,0 +1,4 @@
+@ARCHLIB@/QtGui4.pm
+@ARCHLIB@/auto/QtGui4/QtGui4.so
+usr/bin/puic4
+usr/bin/prcc4_bin
diff -Nru qt4-perl-4.10.2/debian/libqtnetwork4-perl.install qt4-perl-4.10.2/debian/libqtnetwork4-perl.install
--- qt4-perl-4.10.2/debian/libqtnetwork4-perl.install 2010-07-13 10:56:10.000000000 +0200
+++ qt4-perl-4.10.2/debian/libqtnetwork4-perl.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/perl5/QtNetwork4.pm
-usr/lib/perl5/auto/QtNetwork4/QtNetwork4.so
diff -Nru qt4-perl-4.10.2/debian/libqtnetwork4-perl.install.in qt4-perl-4.10.2/debian/libqtnetwork4-perl.install.in
--- qt4-perl-4.10.2/debian/libqtnetwork4-perl.install.in 1970-01-01 01:00:00.000000000 +0100
+++ qt4-perl-4.10.2/debian/libqtnetwork4-perl.install.in 2014-07-03 00:12:31.000000000 +0200
@@ -0,0 +1,2 @@
+@ARCHLIB@/QtNetwork4.pm
+@ARCHLIB@/auto/QtNetwork4/QtNetwork4.so
diff -Nru qt4-perl-4.10.2/debian/libqttest4-perl.install qt4-perl-4.10.2/debian/libqttest4-perl.install
--- qt4-perl-4.10.2/debian/libqttest4-perl.install 2010-07-13 10:56:14.000000000 +0200
+++ qt4-perl-4.10.2/debian/libqttest4-perl.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/perl5/QtTest4.pm
-usr/lib/perl5/auto/QtTest4/QtTest4.so
diff -Nru qt4-perl-4.10.2/debian/libqttest4-perl.install.in qt4-perl-4.10.2/debian/libqttest4-perl.install.in
--- qt4-perl-4.10.2/debian/libqttest4-perl.install.in 1970-01-01 01:00:00.000000000 +0100
+++ qt4-perl-4.10.2/debian/libqttest4-perl.install.in 2014-07-03 00:12:31.000000000 +0200
@@ -0,0 +1,2 @@
+@ARCHLIB@/QtTest4.pm
+@ARCHLIB@/auto/QtTest4/QtTest4.so
diff -Nru qt4-perl-4.10.2/debian/libqtxml4-perl.install qt4-perl-4.10.2/debian/libqtxml4-perl.install
--- qt4-perl-4.10.2/debian/libqtxml4-perl.install 2010-07-13 10:56:17.000000000 +0200
+++ qt4-perl-4.10.2/debian/libqtxml4-perl.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/perl5/QtXml4.pm
-usr/lib/perl5/auto/QtXml4/QtXml4.so
diff -Nru qt4-perl-4.10.2/debian/libqtxml4-perl.install.in qt4-perl-4.10.2/debian/libqtxml4-perl.install.in
--- qt4-perl-4.10.2/debian/libqtxml4-perl.install.in 1970-01-01 01:00:00.000000000 +0100
+++ qt4-perl-4.10.2/debian/libqtxml4-perl.install.in 2014-07-03 00:12:31.000000000 +0200
@@ -0,0 +1,2 @@
+@ARCHLIB@/QtXml4.pm
+@ARCHLIB@/auto/QtXml4/QtXml4.so
diff -Nru qt4-perl-4.10.2/debian/rules qt4-perl-4.10.2/debian/rules
--- qt4-perl-4.10.2/debian/rules 2013-04-07 18:07:44.000000000 +0200
+++ qt4-perl-4.10.2/debian/rules 2014-07-03 00:21:44.000000000 +0200
@@ -3,3 +3,13 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
DEB_CMAKE_EXTRA_FLAGS=-DCUSTOM_PERL_SITE_ARCH_DIR=$(shell perl -MConfig -e 'print $$Config{installvendorarch}')
+
+ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
+
+clean::
+ $(RM) --verbose debian/*.install
+
+common-install-arch::
+ for i in debian/*.install.in; do \
+ sed -e 's,@ARCHLIB@,$(ARCHLIB),g' $$i > debian/$$(basename $$i .in); \
+ done
signature.asc
Description: Digital Signature
