Source: libidn Version: 1.22-1 Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: ubuntu-patch oneiric origin-ubuntu
Hi guys, Please find attached a patch to libidn 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 oneiric, 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
=== modified file 'debian/control' --- debian/control 2010-12-07 08:35:12 +0000 +++ debian/control 2011-05-28 21:45:47 +0000 @@ -5,7 +5,7 @@ Uploaders: Simon Josefsson <si...@josefsson.org> XS-Dm-Upload-Allowed: yes Standards-Version: 3.9.1 -Build-Depends: debhelper (>= 6), gcj-jdk [!arm !hppa !hurd-i386], fastjar [!arm !hppa !hurd-i386] +Build-Depends: debhelper (>= 8.1.3), gcj-jdk [!arm !hppa !hurd-i386], fastjar [!arm !hppa !hurd-i386] Vcs-Cvs: :pserver:anonym...@cvs.savannah.gnu.org:/sources/libidn Vcs-Browser: http://cvs.savannah.gnu.org/viewvc/debian-libidn/?root=libidn Homepage: http://www.gnu.org/software/libidn/ @@ -43,6 +44,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libidn9-dev Replaces: libidn11-dev +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: GNU Libidn library, implementation of IETF IDN specifications GNU Libidn is a fully documented implementation of the Stringprep, Punycode and IDNA specifications. Libidn's purpose is to encode and === modified file 'debian/libidn11-dev.install' --- debian/libidn11-dev.install 2008-06-01 16:06:44 +0000 +++ debian/libidn11-dev.install 2011-05-28 21:44:28 +0000 @@ -1,5 +1,5 @@ debian/tmp/usr/include/* -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/info/libidn-components.png === modified file 'debian/libidn11.install' --- debian/libidn11.install 2004-08-20 23:56:00 +0000 +++ debian/libidn11.install 2011-05-28 21:44:28 +0000 @@ -1,2 +1,1 @@ -debian/tmp/usr/lib/lib*.so.* -debian/tmp/usr/lib/lib*.la +debian/tmp/usr/lib/*/lib*.so.* === modified file 'debian/rules' --- debian/rules 2011-03-01 16:14:24 +0000 +++ debian/rules 2011-05-28 21:44:28 +0000 @@ -16,9 +16,10 @@ # 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) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) CFG_CROSS = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) -CFG_PATHS = --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info +CFG_PATHS = --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFG_VERS = `dpkg-parsechangelog|grep ^Version:|cut -d\ -f2` CFG_DEBP = --with-packager=Debian --with-packager-version=$(CFG_VERS) --with-packager-bug-reports=http://bugs.debian.org/
signature.asc
Description: Digital signature
