[xml/sgml-pkgs] Bug#869544: libxmlsec1-dev: move xmlsec1-gnutls.pc to a multiarch location

[Helmut Grohne]

Package: libxmlsec1-dev
Version: 1.2.24-3
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap
Control: affects -1 + src:libaqbanking

libaqbanking fails to cross build from source, because it cannot find
xmlsec1-gnutls.pc during package configuration. During cross building,
pkg-config ignores /usr/lib/pkgconfig and only searches
/usr/share/pkgconfig and /usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig. Thus
xmlsec1-gnutls.pc should be moved to a location where pkg-config can
find it. The attached patch achieves that. Please consider applying it.

Helmut
-------------- next part --------------
diff --minimal -Nru xmlsec1-1.2.24/debian/changelog xmlsec1-1.2.24/debian/changelog
--- xmlsec1-1.2.24/debian/changelog	2017-07-01 10:09:31.000000000 +0200
+++ xmlsec1-1.2.24/debian/changelog	2017-07-24 06:57:10.000000000 +0200
@@ -1,3 +1,10 @@
+xmlsec1 (1.2.24-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Configure with multiarch --libdir (closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 24 Jul 2017 06:57:10 +0200
+
 xmlsec1 (1.2.24-3) unstable; urgency=medium
 
   * upload to unstable
diff --minimal -Nru xmlsec1-1.2.24/debian/libxmlsec1-dev.install xmlsec1-1.2.24/debian/libxmlsec1-dev.install
--- xmlsec1-1.2.24/debian/libxmlsec1-dev.install	2017-06-23 12:53:49.000000000 +0200
+++ xmlsec1-1.2.24/debian/libxmlsec1-dev.install	2017-07-24 06:57:10.000000000 +0200
@@ -1,6 +1,6 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/lib*.la
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/lib*.la
+usr/lib/*/pkgconfig/*
 usr/bin/xmlsec1-config
diff --minimal -Nru xmlsec1-1.2.24/debian/libxmlsec1-gcrypt.install xmlsec1-1.2.24/debian/libxmlsec1-gcrypt.install
--- xmlsec1-1.2.24/debian/libxmlsec1-gcrypt.install	2017-06-23 12:57:19.000000000 +0200
+++ xmlsec1-1.2.24/debian/libxmlsec1-gcrypt.install	2017-07-24 06:57:10.000000000 +0200
@@ -1 +1 @@
-usr/lib/libxmlsec1-gcrypt.so.*
+usr/lib/*/libxmlsec1-gcrypt.so.*
diff --minimal -Nru xmlsec1-1.2.24/debian/libxmlsec1-gnutls.install xmlsec1-1.2.24/debian/libxmlsec1-gnutls.install
--- xmlsec1-1.2.24/debian/libxmlsec1-gnutls.install	2017-06-23 12:53:49.000000000 +0200
+++ xmlsec1-1.2.24/debian/libxmlsec1-gnutls.install	2017-07-24 06:57:10.000000000 +0200
@@ -1 +1 @@
-usr/lib/libxmlsec1-gnutls.so.*
+usr/lib/*/libxmlsec1-gnutls.so.*
diff --minimal -Nru xmlsec1-1.2.24/debian/libxmlsec1-nss.install xmlsec1-1.2.24/debian/libxmlsec1-nss.install
--- xmlsec1-1.2.24/debian/libxmlsec1-nss.install	2017-06-23 12:53:49.000000000 +0200
+++ xmlsec1-1.2.24/debian/libxmlsec1-nss.install	2017-07-24 06:57:10.000000000 +0200
@@ -1 +1 @@
-usr/lib/libxmlsec1-nss.so.*
+usr/lib/*/libxmlsec1-nss.so.*
diff --minimal -Nru xmlsec1-1.2.24/debian/libxmlsec1-openssl.install xmlsec1-1.2.24/debian/libxmlsec1-openssl.install
--- xmlsec1-1.2.24/debian/libxmlsec1-openssl.install	2017-06-23 12:53:49.000000000 +0200
+++ xmlsec1-1.2.24/debian/libxmlsec1-openssl.install	2017-07-24 06:57:10.000000000 +0200
@@ -1 +1 @@
-usr/lib/libxmlsec1-openssl.so.*
+usr/lib/*/libxmlsec1-openssl.so.*
diff --minimal -Nru xmlsec1-1.2.24/debian/libxmlsec1.install xmlsec1-1.2.24/debian/libxmlsec1.install
--- xmlsec1-1.2.24/debian/libxmlsec1.install	2017-06-23 12:53:49.000000000 +0200
+++ xmlsec1-1.2.24/debian/libxmlsec1.install	2017-07-24 06:57:10.000000000 +0200
@@ -1 +1 @@
-usr/lib/libxmlsec1.so.*
+usr/lib/*/libxmlsec1.so.*
diff --minimal -Nru xmlsec1-1.2.24/debian/rules xmlsec1-1.2.24/debian/rules
--- xmlsec1-1.2.24/debian/rules	2017-06-26 16:14:59.000000000 +0200
+++ xmlsec1-1.2.24/debian/rules	2017-07-24 06:56:59.000000000 +0200
@@ -7,10 +7,7 @@
 
 export OFFLINE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+include /usr/share/dpkg/architecture.mk
 
 # shared library versions, option 1
 #version=2.0.5
@@ -30,6 +27,7 @@
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		$(shell dpkg-buildflags --export=configure) \
 		--prefix=/usr \
+		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--with-html-dir=\$${prefix}/share/doc/xmlsec1/html \
@@ -74,7 +72,7 @@
 	# Add here commands to install the package into debian/tmp
 	$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
 	# strip unwanted RPATH caused by bug in old libtool
-	chrpath -d $(CURDIR)/debian/tmp/usr/lib/*.so \
+	chrpath -d $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so \
 		$(CURDIR)/debian/tmp/usr/bin/xmlsec1
 	find debian/tmp/usr/lib -name "*.la" -exec \
 		sed -i -e "s,^dependency_libs=.*,dependency_libs=''," {} +
@@ -98,7 +96,7 @@
 	dh_fixperms
 	dh_makeshlibs -V
 	dh_installdeb
-	dh_shlibdeps -l $(CURDIR)/debian/libxmlsec1/usr/lib
+	dh_shlibdeps -l $(CURDIR)/debian/libxmlsec1/usr/lib/$(DEB_HOST_MULTIARCH)
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb