Source: libgpg-error Version: 1.10-0.3 Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: ubuntu-patch oneiric origin-ubuntu
Hi folks, Please find attached a patch to libgpg-error to transition it to use of the multiarch library paths as described at <http://wiki.debian.org/Multiarch/Implementation>. This patch has been applied and is being used successfully in Ubuntu 11.04, and should be safe to apply in Debian now that multiarch has been bootstrapped there. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
diff -uNr --exclude .bzr debian/debian/clean trunk/debian/clean --- debian/debian/clean 1969-12-31 16:00:00.000000000 -0800 +++ trunk/debian/clean 2011-03-20 22:35:19.000000000 -0700 @@ -0,0 +1,2 @@ +debian/libgpg-error0.install +debian/libgpg-error-dev.links diff -uNr --exclude .bzr debian/debian/control trunk/debian/control --- debian/debian/control 2011-07-17 01:00:01.000000000 -0700 +++ trunk/debian/control 2011-03-20 22:54:02.000000000 -0700 @@ -3,7 +3,7 @@ Maintainer: Jose Carlos Garcia Sogo <js...@debian.org> Uploaders: Matthias Urlichs <sm...@debian.org> Priority: standard -Build-Depends: debhelper (>= 7.0.15) +Build-Depends: debhelper (>= 8.1.3) Standards-Version: 3.9.1 Homepage: http://www.gnupg.org/related_software/libgpg-error/ @@ -23,6 +24,8 @@ Package: libgpg-error0 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: library for common error values and messages in GnuPG components Library that defines common error values for all GnuPG components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, diff -uNr --exclude .bzr debian/debian/libgpg-error0.install trunk/debian/libgpg-error0.install --- debian/debian/libgpg-error0.install 2011-07-17 01:00:01.000000000 -0700 +++ trunk/debian/libgpg-error0.install 1969-12-31 16:00:00.000000000 -0800 @@ -1,2 +0,0 @@ -usr/lib/libgpg-error.so.* lib -usr/share/locale diff -uNr --exclude .bzr debian/debian/libgpg-error0.install.in trunk/debian/libgpg-error0.install.in --- debian/debian/libgpg-error0.install.in 1969-12-31 16:00:00.000000000 -0800 +++ trunk/debian/libgpg-error0.install.in 2011-03-20 22:32:57.000000000 -0700 @@ -0,0 +1,2 @@ +usr/lib/${DEB_HOST_MULTIARCH}/libgpg-error.so.* lib/${DEB_HOST_MULTIARCH} +usr/share/locale diff -uNr --exclude .bzr debian/debian/libgpg-error0-udeb.install trunk/debian/libgpg-error0-udeb.install --- debian/debian/libgpg-error0-udeb.install 2011-07-17 01:00:01.000000000 -0700 +++ trunk/debian/libgpg-error0-udeb.install 2011-03-20 22:34:19.000000000 -0700 @@ -1 +1 @@ -usr/lib/libgpg-error.so.* lib +usr/lib/*/libgpg-error.so.* lib diff -uNr --exclude .bzr debian/debian/libgpg-error-dev.install trunk/debian/libgpg-error-dev.install --- debian/debian/libgpg-error-dev.install 2011-07-17 01:00:01.000000000 -0700 +++ trunk/debian/libgpg-error-dev.install 2011-03-20 22:34:32.000000000 -0700 @@ -1,5 +1,4 @@ usr/bin/* usr/include/* -usr/lib/libgpg-error.la -#usr/lib/libgpg-error.so +#usr/lib/*/libgpg-error.so usr/share/aclocal/*.m4 diff -uNr --exclude .bzr debian/debian/libgpg-error-dev.links trunk/debian/libgpg-error-dev.links --- debian/debian/libgpg-error-dev.links 2011-07-17 01:00:01.000000000 -0700 +++ trunk/debian/libgpg-error-dev.links 1969-12-31 16:00:00.000000000 -0800 @@ -1 +0,0 @@ -lib/libgpg-error.so.0 usr/lib/libgpg-error.so diff -uNr --exclude .bzr debian/debian/libgpg-error-dev.links.in trunk/debian/libgpg-error-dev.links.in --- debian/debian/libgpg-error-dev.links.in 1969-12-31 16:00:00.000000000 -0800 +++ trunk/debian/libgpg-error-dev.links.in 2011-03-20 22:35:01.000000000 -0700 @@ -0,0 +1 @@ +lib/${DEB_HOST_MULTIARCH}/libgpg-error.so.0 usr/lib/${DEB_HOST_MULTIARCH}/libgpg-error.so diff -uNr --exclude .bzr debian/debian/rules trunk/debian/rules --- debian/debian/rules 2011-07-17 01:00:01.000000000 -0700 +++ trunk/debian/rules 2011-03-20 22:35:41.000000000 -0700 @@ -22,6 +22,7 @@ export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --build $(DEB_HOST_GNU_TYPE) @@ -41,6 +42,7 @@ ./configure $(confflags) --enable-maintainer-mode \ --prefix=/usr --mandir=\$${prefix}/share/man \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --infodir=\$${prefix}/share/info touch configure-stamp @@ -77,6 +79,11 @@ dh_testdir dh_testroot dh_prep + set -e; for file in libgpg-error0.install libgpg-error-dev.links; \ + do \ + sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \ + debian/$${file}.in > debian/$$file; \ + done dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/ @@ -89,7 +96,6 @@ dh_testdir dh_testroot dh_install --sourcedir=debian/tmp - sed -i "/dependency_libs/ s/'.*'/''/" debian/*/usr/lib/*.la dh_installdocs dh_installman
signature.asc
Description: Digital signature
