Package: libgpgme11 Version: 1.2.0-1.4 Severity: wishlist Tags: patch User: [email protected] Usertags: multiarch Control: block -1 by 698949
Here's a patch adding multiarch support to libgpgme11, thus making it co-installable on multiple architectures. Please note that while I checked the resulting packages with lintian[*] and debdiff, I did not actually install and test them. So, caveat emptor. :) [*] Inasmuch as this patch did not trigger any new warnings. -- System Information: Debian Release: 7.0 APT prefers unstable APT policy: (500, 'unstable') Architecture: i386 (x86_64) Foreign Architectures: amd64 Kernel: Linux 3.2.0-4-amd64 (SMP w/3 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages libgpgme11 depends on: ii gnupg 1.4.12-7 ii libc6 2.13-38 ii libgpg-error0 1.10-3.1 ii libpth20 2.0.7-16 libgpgme11 recommends no packages. Versions of packages libgpgme11 suggests: pn gnupg2 <none> pn gpgsm <none> -- no debconf information
diff --git a/debian/control b/debian/control index c2f1db2..e3706de 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: gpgme1.0 Priority: optional Section: libdevel Maintainer: Jose Carlos Garcia Sogo <[email protected]> -Build-Depends: debhelper (>> 5.0.0), libgpg-error-dev (>= 0.7-1), dpatch (>= 1.11), libpth-dev +Build-Depends: debhelper (>> 8.1.3), libgpg-error-dev (>= 0.7-1), dpatch (>= 1.11), libpth-dev Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/users/jsogo/gpgme1.0.git Vcs-Browser: http://git.debian.org/git/users/jsogo/gpgme1.0.git @@ -22,6 +22,8 @@ Description: GPGME - GnuPG Made Easy Package: libgpgme11 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, gnupg (>= 1.4.6-2) Suggests: gpgsm (>= 1.9.6), gnupg2 (>= 2.0.4) Description: GPGME - GnuPG Made Easy diff --git a/debian/libgpgme11-dev.files b/debian/libgpgme11-dev.files index f1799d1..eb8c8b3 100644 --- a/debian/libgpgme11-dev.files +++ b/debian/libgpgme11-dev.files @@ -1,7 +1,7 @@ usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/*.la +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/*.la usr/bin/gpgme-config usr/share/aclocal/* usr/share/info/* diff --git a/debian/libgpgme11.files b/debian/libgpgme11.files index d0dbfd1..3ddde58 100644 --- a/debian/libgpgme11.files +++ b/debian/libgpgme11.files @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff --git a/debian/rules b/debian/rules index 394e8df..566301b 100755 --- a/debian/rules +++ b/debian/rules @@ -31,6 +31,8 @@ ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) else confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) version=`ls gpgme/.libs/lib*.so.* | \ @@ -48,6 +50,7 @@ configure-stamp: patch-stamp ./configure $(confflags) \ --enable-static \ --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --with-gpg=/usr/bin/gpg \ --with-gpgsm=/usr/bin/gpgsm \ --with-gpgconf=/usr/bin/gpgconf @@ -80,7 +83,7 @@ install: build dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/ - for file in debian/tmp/usr/lib/*.la; do \ + for file in debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la; do \ sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \ done
