Package: aalib Version: 1.4p5-39 Severity: normal Tags: patch User: [email protected] Usertags: origin-ubuntu precise ubuntu-patch
Hi Bart, Please find attached a patch to aalib 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. This is a priority for Ubuntu because libaa1 is a dependency of gstreamer0.10-plugins-good, needed by wine1.3; however, in Debian the wine doesn't appear to use gstreamer, so I don't know of any particular urgency for this change. The changelog entry for this upload to Ubuntu is as follows: * Build for multiarch. - libaa1-dev can't be marked multi-arch: same because it includes /usr/bin/aa-config, which embeds arch-specific library paths. This tool needs to be fixed, or dropped in favor of pkg-config, before libaa1-dev can be M-A: same. Note that in preparing the upload I've also trimmed out one of the .la sed commands from debian/rules, since it's redundant now that dependency_libs is being completely emptied. 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/ [email protected] [email protected]
=== modified file 'debian/compat' --- debian/compat 2008-04-23 23:14:34 +0000 +++ debian/compat 2011-10-22 22:56:46 +0000 @@ -1 +1 @@ -7 +9 === modified file 'debian/control' --- debian/control 2011-09-14 07:16:38 +0000 +++ debian/control 2011-10-22 23:20:46 +0000 @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Bart Martens <[email protected]> -Build-Depends: dpkg-dev (>= 1.14.9), debhelper (>= 7), libslang2-dev, libx11-dev, libxt-dev, libncurses5-dev, libgpmg1-dev [linux-any], autoconf, libtool (>= 1.3.5), automake | automake1.10, dpkg-dev (>= 1.9.0), texinfo, patch +Build-Depends: dpkg-dev (>= 1.14.9), debhelper (>= 8.1.3~), libslang2-dev, libx11-dev, libxt-dev, libncurses5-dev, libgpmg1-dev [linux-any], autoconf, libtool (>= 1.3.5), automake | automake1.10, dpkg-dev (>= 1.9.0), texinfo, patch Standards-Version: 3.9.2 Homepage: http://aa-project.sourceforge.net/aalib/ @@ -22,8 +22,10 @@ Package: libaa1 Architecture: any +Multi-Arch: same Provides: aalib1 Replaces: aalib1 +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: ASCII art library AAlib is a portable ASCII art graphics library. Internally, it works like @@ -46,6 +48,7 @@ Package: libaa1-dbg Architecture: any +Multi-Arch: same Section: debug Priority: extra Depends: libaa1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} === modified file 'debian/libaa1-dev.install' --- debian/libaa1-dev.install 2005-12-18 16:58:45 +0000 +++ debian/libaa1-dev.install 2011-10-22 22:57:27 +0000 @@ -1,6 +1,6 @@ -usr/lib/libaa.so -usr/lib/libaa.a -usr/lib/libaa.la +usr/lib/*/libaa.so +usr/lib/*/libaa.a +usr/lib/*/libaa.la usr/bin/aalib-config usr/include/ usr/share/man/man3/ === modified file 'debian/libaa1.install' --- debian/libaa1.install 2005-12-18 16:58:45 +0000 +++ debian/libaa1.install 2011-10-22 22:57:27 +0000 @@ -1,2 +1,2 @@ -usr/lib/libaa.so.1.* -usr/lib/libaa.so.1 +usr/lib/*/libaa.so.1.* +usr/lib/*/libaa.so.1 === modified file 'debian/rules' --- debian/rules 2011-09-14 07:16:38 +0000 +++ debian/rules 2011-10-22 22:58:54 +0000 @@ -37,15 +37,9 @@ dh_link -plibaa1-dbg /usr/share/doc/libaa1 /usr/share/doc/libaa1-dbg dh install --remaining -v - # Remove -lgpm from libaa.la - sed s/-lgpm// debian/libaa1-dev/usr/lib/libaa.la > \ - debian/libaa1-dev/usr/lib/libaa.la.new - mv -f debian/libaa1-dev/usr/lib/libaa.la.new \ - debian/libaa1-dev/usr/lib/libaa.la - # Empty dependency_libs field http://wiki.debian.org/ReleaseGoals/LAFileRemoval # fixes non-empty-dependency_libs-in-la-file - sed -i "/dependency_libs/ s/'.*'/''/" debian/libaa1-dev/usr/lib/libaa.la + sed -i "/dependency_libs/ s/'.*'/''/" debian/libaa1-dev/usr/lib/*/libaa.la binary-arch: install dh_strip -Nlibaa-bin --dbg-package=libaa1-dbg
