Package: src:gsasl
Version: 1.8.0-8
Tags: patch
User: d...@debian.org
Usertags: multiarch

please multiarchify the library packages, patch attached.
  * Multiarchify the library packages.
  * Bump debhelper and standards version.

diff -Nru gsasl-1.8.0/debian/compat gsasl-1.8.0/debian/compat
--- gsasl-1.8.0/debian/compat	2014-09-06 23:40:49.000000000 +0200
+++ gsasl-1.8.0/debian/compat	2016-09-16 12:03:50.000000000 +0200
@@ -1 +1 @@
-7
+9
diff -Nru gsasl-1.8.0/debian/control gsasl-1.8.0/debian/control
--- gsasl-1.8.0/debian/control	2015-08-01 13:59:13.000000000 +0200
+++ gsasl-1.8.0/debian/control	2016-09-16 12:03:50.000000000 +0200
@@ -5,15 +5,16 @@
 XSBC-Original-Maintainer: Debian XMPP Maintainers <pkg-xmpp-de...@lists.alioth.debian.org>
 Uploaders: Thadeu Lima de Souza Cascardo <casca...@minaslivre.org>,
  Jorge Salamero Sanz <ben...@debian.org>, Simon Josefsson <si...@josefsson.org>
-Build-Depends: cdbs, debhelper (>= 7.0.0), gettext, texinfo, pkg-config, libkrb5-dev, help2man, libidn11-dev, libgnutls28-dev, libntlm0-dev, dh-autoreconf, automake1.11, valgrind [amd64 i386 powerpc]
+Build-Depends: cdbs, debhelper (>= 9), gettext, texinfo, pkg-config, libkrb5-dev, help2man, libidn11-dev, libgnutls28-dev, libntlm0-dev, dh-autoreconf, automake1.11, valgrind [amd64 i386 powerpc], chrpath
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xmpp/gsasl.git
 Vcs-Git: git://anonscm.debian.org/pkg-xmpp/gsasl.git
 Homepage: http://www.gnu.org/software/gsasl/
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 
 Package: libgsasl7-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Conflicts: libgsasl1-dev
 Replaces: libgsasl1-dev
 Depends: libgsasl7 (= ${binary:Version}), libidn11-dev, pkg-config,
@@ -31,6 +32,7 @@
 Package: libgsasl7
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libgsasl1
 Replaces: libgsasl1
diff -Nru gsasl-1.8.0/debian/libgsasl7-dev.install gsasl-1.8.0/debian/libgsasl7-dev.install
--- gsasl-1.8.0/debian/libgsasl7-dev.install	2014-09-06 23:40:49.000000000 +0200
+++ gsasl-1.8.0/debian/libgsasl7-dev.install	2016-09-16 12:03:50.000000000 +0200
@@ -1,6 +1,5 @@
 debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.la
-debian/tmp/usr/lib/lib*.a  
-debian/tmp/usr/lib/lib*.so 
-debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/lib/*/lib*.a  
+debian/tmp/usr/lib/*/lib*.so 
+debian/tmp/usr/lib/*/pkgconfig/*
 debian/tmp/usr/share/man/man3/*
diff -Nru gsasl-1.8.0/debian/libgsasl7.install gsasl-1.8.0/debian/libgsasl7.install
--- gsasl-1.8.0/debian/libgsasl7.install	2014-09-06 23:40:49.000000000 +0200
+++ gsasl-1.8.0/debian/libgsasl7.install	2016-09-16 12:03:50.000000000 +0200
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/lib/*/lib*.so.*
 debian/tmp/usr/share/locale/*
diff -Nru gsasl-1.8.0/debian/rules gsasl-1.8.0/debian/rules
--- gsasl-1.8.0/debian/rules	2014-10-02 14:47:17.000000000 +0200
+++ gsasl-1.8.0/debian/rules	2016-09-16 12:03:50.000000000 +0200
@@ -5,14 +5,17 @@
 export AUTOMAKE = automake-1.11
 export ACLOCAL = aclocal-1.11
 include /usr/share/cdbs/1/rules/autoreconf.mk
+DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 DEB_DH_STRIP_ARGS = --dbg-package=gsasl-dbg
 DEB_MAKE_CHECK_TARGET = check
 DEB_DH_MAKESHLIBS_ARGS_libgsasl7 = -- -c4
 
 DEB_CONFIGURE_USER_FLAGS = --disable-valgrind-tests --without-libgcrypt --with-gssapi-impl=mit
-DEB_CONFIGURE_EXTRA_FLAGS = --with-packager=Debian --with-packager-version=$(DEB_VERSION) --with-packager-bug-reports=http://bugs.debian.org/
+DEB_CONFIGURE_EXTRA_FLAGS = --with-packager=Debian --with-packager-version=$(DEB_VERSION) --with-packager-bug-reports=http://bugs.debian.org/ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 common-install-arch::
 	find debian/tmp/usr/lib -name "*.la" -exec \
 		sed -i -e "s,^dependency_libs=.*,dependency_libs=''," {} +
+	chrpath -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgsasl.so.7.?.?
+	chrpath -d debian/tmp/usr/bin/gsasl

Reply via email to