Package: libunistring Version: 0.9.3-4 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu precise ubuntu-patch
Hi Andreas, Please find attached a patch to libunistring to transition it to use the multiarch library paths as described at <http://wiki.debian.org/Multiarch/Implementation>. This patch is being applied in Ubuntu precise. Since libunistring0 is a dependency of gettext, converting this libunistring for multiarch is a prerequisite for wine 1.3 being built for multiarch (bug #646034). While wine in Debian doesn't use libgettextpo yet in Debian, it would be nice to have the libraries ready for when it does. Note that this patch drops all the .dirs files from the debian directory. Directories only need to be declared separately to dh_installdirs if you're shipping an *empty* directory; if you're installing files to it, dh_install creates the path for you automatically. Thanks for considering the patch! -- 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/compat' --- debian/compat 2009-07-04 14:31:38 +0000 +++ debian/compat 2011-10-20 23:50:05 +0000 @@ -1 +1 @@ -7 +9 === modified file 'debian/control' --- debian/control 2011-04-16 14:09:54 +0000 +++ debian/control 2011-10-21 00:30:51 +0000 @@ -1,7 +1,7 @@ Source: libunistring Priority: optional Maintainer: Andreas Rottmann <ro...@debian.org> -Build-Depends: cdbs, debhelper (>= 7), autotools-dev +Build-Depends: cdbs (>= 0.4.93~), debhelper (>= 8.1.3~), autotools-dev Standards-Version: 3.9.1 Section: libs Homepage: http://www.gnu.org/software/libunistring/ @@ -11,6 +12,7 @@ Package: libunistring-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libunistring0 (= ${binary:Version}), ${misc:Depends} Description: Unicode string library for C - development files The 'libunistring' library implements Unicode strings (in the UTF-8, @@ -26,6 +28,8 @@ Package: libunistring0 Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Unicode string library for C The 'libunistring' library implements Unicode strings (in the UTF-8, === removed file 'debian/libunistring-dev.dirs' --- debian/libunistring-dev.dirs 2009-07-04 14:31:38 +0000 +++ debian/libunistring-dev.dirs 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -usr/lib -usr/include -usr/share/doc/libunistring-dev === modified file 'debian/libunistring-dev.install' --- debian/libunistring-dev.install 2011-04-16 14:09:54 +0000 +++ debian/libunistring-dev.install 2011-10-20 23:51:13 +0000 @@ -1,4 +1,4 @@ usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so +usr/lib/*/lib*.a +usr/lib/*/lib*.so usr/share/doc/libunistring/*.html usr/share/doc/libunistring-dev/html/ === removed file 'debian/libunistring0.dirs' --- debian/libunistring0.dirs 2009-07-04 14:31:38 +0000 +++ debian/libunistring0.dirs 1970-01-01 00:00:00 +0000 @@ -1 +0,0 @@ -usr/lib === modified file 'debian/libunistring0.install' --- debian/libunistring0.install 2009-07-04 14:31:38 +0000 +++ debian/libunistring0.install 2011-10-20 23:50:56 +0000 @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* === modified file 'debian/rules' --- debian/rules 2010-09-09 20:22:45 +0000 +++ debian/rules 2011-10-20 23:50:29 +0000 @@ -10,7 +10,8 @@ CFLAGS += -mplt endif -DEB_CONFIGURE_EXTRA_FLAGS := --disable-Werror +DEB_CONFIGURE_EXTRA_FLAGS := --disable-Werror \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) DEB_DH_INSTALL_ARGS := --sourcedir=$(DEB_DESTDIR) DEB_MAKE_CHECK_TARGET = check
