Control: tag -1 + patch
On Mon, 23 Jun 2014 23:10:46 +0300, Niko Tyni wrote:
> This package fails to build with perl_5.20.0-1 from experimental:
>
> dh_install -a -O--parallel
> cp: cannot stat 'debian/tmp/usr/lib/perl5': No such file or directory
> dh_install: cp -a debian/tmp/usr/lib/perl5 debian/ekg2-scripting-perl//usr/lib/ returned exit code 1
> make: *** [binary-arch] Error 2
> debian/rules:13: recipe for target 'binary-arch' failed
> dpkg-buildpackage: error: fakeroot debian/rules binary-arch gave error exit status 2
I'm attaching a debdiff which uses a .install.in file which get
sed'ded during build with the value of $Config{vendorarch}.
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: Van Morrison: Stand By Me
diff -Nru ekg2-0.4~pre+20120506.1/debian/changelog ekg2-0.4~pre+20120506.1/debian/changelog
--- ekg2-0.4~pre+20120506.1/debian/changelog 2014-07-08 07:42:26.000000000 +0200
+++ ekg2-0.4~pre+20120506.1/debian/changelog 2014-07-08 21:02:56.000000000 +0200
@@ -1,3 +1,14 @@
+ekg2 (1:0.4~pre+20120506.1-6) UNRELEASED; urgency=medium
+
+ * QA upload.
+ * Fix "hardcodes /usr/lib/perl5":
+ use a debian/ekg2-scripting-perl.install.in in file where a variable gets
+ replaced from debian/rules at build time with the value of
+ $Config{vendorarch}
+ (Closes: #752470)
+
+ -- gregor herrmann <gregoa@debian.org> Tue, 08 Jul 2014 20:46:56 +0200
+
ekg2 (1:0.4~pre+20120506.1-5) unstable; urgency=low
* Orphaning.
diff -Nru ekg2-0.4~pre+20120506.1/debian/ekg2-scripting-perl.install ekg2-0.4~pre+20120506.1/debian/ekg2-scripting-perl.install
--- ekg2-0.4~pre+20120506.1/debian/ekg2-scripting-perl.install 2014-04-19 20:15:24.000000000 +0200
+++ ekg2-0.4~pre+20120506.1/debian/ekg2-scripting-perl.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-usr/lib/perl5
-usr/lib/ekg2/plugins/perl.so
-usr/lib/ekg2/plugins/perl.la
-usr/share/ekg2/scripts/*.pl
diff -Nru ekg2-0.4~pre+20120506.1/debian/ekg2-scripting-perl.install.in ekg2-0.4~pre+20120506.1/debian/ekg2-scripting-perl.install.in
--- ekg2-0.4~pre+20120506.1/debian/ekg2-scripting-perl.install.in 1970-01-01 01:00:00.000000000 +0100
+++ ekg2-0.4~pre+20120506.1/debian/ekg2-scripting-perl.install.in 2014-07-08 20:55:13.000000000 +0200
@@ -0,0 +1,4 @@
+@ARCHLIB@
+usr/lib/ekg2/plugins/perl.so
+usr/lib/ekg2/plugins/perl.la
+usr/share/ekg2/scripts/*.pl
diff -Nru ekg2-0.4~pre+20120506.1/debian/rules ekg2-0.4~pre+20120506.1/debian/rules
--- ekg2-0.4~pre+20120506.1/debian/rules 2014-04-19 20:15:24.000000000 +0200
+++ ekg2-0.4~pre+20120506.1/debian/rules 2014-07-08 21:06:18.000000000 +0200
@@ -6,6 +6,8 @@
# we specify an explicit automake version
export AUTOMAKE=automake-1.14
+ARCHLIB := $(shell perl -MConfig -e 'print substr($$Config{vendorarch}, 1)')
+
-include /usr/share/topgit/tg2quilt.mk
/usr/share/topgit/tg2quilt.mk:
@@ -67,6 +69,7 @@
cd docs && sh generate-ekg2book.sh en clean
rm -rf docs/doxygen
rm -f docs/ekg2.1
+ rm -f debian/ekg2-scripting-perl.install
dh_auto_clean
override_dh_strip:
@@ -75,6 +78,10 @@
override_dh_auto_install:
perl_install_args="DESTDIR=$(CURDIR)/debian/tmp INSTALLDIRS=vendor" $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+override_dh_install:
+ sed -e 's,@ARCHLIB@,$(ARCHLIB),g' $(CURDIR)/debian/ekg2-scripting-perl.install.in > $(CURDIR)/debian/ekg2-scripting-perl.install
+ dh_install
+
override_dh_installdocs:
dh_installdocs --link-doc=ekg2-core -pekg2 -pekg2-dbg -pekg2-gnupg -pekg2-jabber \
-pekg2-scripting-python -pekg2-scripting-perl
Attachment:
signature.asc
Description: Digital Signature