Bug#752335: libpreludedb: diff for NMU version 1.0.0-2.2

[Ansgar Burchardt]

tags 752335 + patch
tags 752335 + pending
tags 752336 + patch
tags 752336 + pending
thanks

Dear maintainer,

I've prepared an NMU for libpreludedb (versioned as 1.0.0-2.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

diff -u libpreludedb-1.0.0/debian/rules libpreludedb-1.0.0/debian/rules
--- libpreludedb-1.0.0/debian/rules
+++ libpreludedb-1.0.0/debian/rules
@@ -7,6 +7,8 @@
 
 PYVERS=$(shell pyversions -vr)
 
+ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
+
 TMPDIR=debian/tmp
 
 prefix=$(CURDIR)/debian/tmp/usr
@@ -20,6 +22,8 @@
 build: configure-stamp build-stamp $(PYVERS:%=build-python%)
 build-stamp:
 	dh_testdir
+	# Force swig to regenerate PreludeDB.c, cf. https://bugs.debian.org/752335
+	rm -f bindings/perl/PreludeDB.c
 	$(MAKE)
 	
 	touch build-stamp
@@ -35,6 +39,8 @@
 	[ ! -f bindings/perl/Makefile ] || $(MAKE) -C bindings/perl realclean
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -rf bindings/python/build
+	rm -f bindings/perl/PreludeDB.c
+	rm -f debian/libpreludedb-perl.install
 	dh_clean
 
 install: install-core $(PYVERS:%=install-python%)
@@ -48,6 +54,7 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	find $(CURDIR)/debian/tmp -name \*.pyc -exec rm -f {} \;
 	find $(CURDIR)/debian/tmp -name \*.la -delete
+	sed -e 's,$${archlib},$(ARCHLIB),g' debian/libpreludedb-perl.install.in > debian/libpreludedb-perl.install
 #	$(INSTALLD) $(TMPDIR)/etc/prelude/	\
 #		$(TMPDIR)/etc/prelude/default/	\
 #		$(TMPDIR)/etc/prelude/profile/	\
diff -u libpreludedb-1.0.0/debian/changelog libpreludedb-1.0.0/debian/changelog
--- libpreludedb-1.0.0/debian/changelog
+++ libpreludedb-1.0.0/debian/changelog
@@ -1,3 +1,13 @@
+libpreludedb (1.0.0-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Force swig to regenerate bindings/perl/PreludeDB.c by removing it
+    before building and in the clean target. (Closes: #752335)
+  * Use perl's $Config{vendorarch} instead of /usr/lib/perl5. Thanks
+    to Niko Tyni for the patch. (Closes: #752336)
+
+ -- Ansgar Burchardt <ans...@debian.org>  Tue, 05 Aug 2014 22:27:33 +0200
+
 libpreludedb (1.0.0-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
reverted:
--- libpreludedb-1.0.0/debian/libpreludedb-perl.install
+++ libpreludedb-1.0.0.orig/debian/libpreludedb-perl.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/perl*
only in patch2:
unchanged:
--- libpreludedb-1.0.0.orig/debian/libpreludedb-perl.install.in
+++ libpreludedb-1.0.0/debian/libpreludedb-perl.install.in
@@ -0,0 +1 @@
+debian/tmp/${archlib}