[xml/sgml-commit] [xmlsec1] 01/02: apply patch from Helmut Grohne to Configure with multiarch --libdir (closes: #869544)

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository xmlsec1.

commit acbcd8cf93eec1b74c1866f243b131a741ebacf5
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Jul 24 21:34:57 2017 +0200

    apply patch from Helmut Grohne to Configure with multiarch --libdir (closes: #869544)
---
 debian/changelog                  |  7 +++++++
 debian/libxmlsec1-dev.install     |  8 ++++----
 debian/libxmlsec1-gcrypt.install  |  2 +-
 debian/libxmlsec1-gnutls.install  |  2 +-
 debian/libxmlsec1-nss.install     |  2 +-
 debian/libxmlsec1-openssl.install |  2 +-
 debian/libxmlsec1.install         |  2 +-
 debian/rules                      | 10 ++++------
 8 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9a14a1b..7b645b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xmlsec1 (1.2.24-4) unstable; urgency=medium
+
+  * apply patch from Helmut Grohne to
+    Configure with multiarch --libdir (closes: #869544)
+
+ -- Rene Engelhard <rene at debian.org>  Mon, 24 Jul 2017 21:28:00 +0200
+
 xmlsec1 (1.2.24-3) unstable; urgency=medium
 
   * upload to unstable
diff --git a/debian/libxmlsec1-dev.install b/debian/libxmlsec1-dev.install
index 99ee547..5f2d771 100644
--- a/debian/libxmlsec1-dev.install
+++ b/debian/libxmlsec1-dev.install
@@ -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 --git a/debian/libxmlsec1-gcrypt.install b/debian/libxmlsec1-gcrypt.install
index cfda507..ad9ea41 100644
--- a/debian/libxmlsec1-gcrypt.install
+++ b/debian/libxmlsec1-gcrypt.install
@@ -1 +1 @@
-usr/lib/libxmlsec1-gcrypt.so.*
+usr/lib/*/libxmlsec1-gcrypt.so.*
diff --git a/debian/libxmlsec1-gnutls.install b/debian/libxmlsec1-gnutls.install
index c674abd..f5dfd95 100644
--- a/debian/libxmlsec1-gnutls.install
+++ b/debian/libxmlsec1-gnutls.install
@@ -1 +1 @@
-usr/lib/libxmlsec1-gnutls.so.*
+usr/lib/*/libxmlsec1-gnutls.so.*
diff --git a/debian/libxmlsec1-nss.install b/debian/libxmlsec1-nss.install
index e9c6c52..10cbca9 100644
--- a/debian/libxmlsec1-nss.install
+++ b/debian/libxmlsec1-nss.install
@@ -1 +1 @@
-usr/lib/libxmlsec1-nss.so.*
+usr/lib/*/libxmlsec1-nss.so.*
diff --git a/debian/libxmlsec1-openssl.install b/debian/libxmlsec1-openssl.install
index 12f7b70..6d5eaed 100644
--- a/debian/libxmlsec1-openssl.install
+++ b/debian/libxmlsec1-openssl.install
@@ -1 +1 @@
-usr/lib/libxmlsec1-openssl.so.*
+usr/lib/*/libxmlsec1-openssl.so.*
diff --git a/debian/libxmlsec1.install b/debian/libxmlsec1.install
index 88c4e4e..2c0694e 100644
--- a/debian/libxmlsec1.install
+++ b/debian/libxmlsec1.install
@@ -1 +1 @@
-usr/lib/libxmlsec1.so.*
+usr/lib/*/libxmlsec1.so.*
diff --git a/debian/rules b/debian/rules
index 8e9e0d6..f055cd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ config.status: configure
 		--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 @@ install: build
 	# 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 @@ binary-arch: build install
 	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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-xml-sgml/xmlsec1.git