Package: libid3tag0 Version: 0.15.1b-10 Severity: wishlist Tags: patch User: [email protected] Usertags: multiarch
Here's a patch adding multiarch support to libid3tag0, thus making it co-installable on multiple architectures. (The -dev package could also be marked Multi-Arch: same, but I wanted to keep it as simple as possible.) Please note that while I checked the resulting packages with lintian[*] and debdiff (and took a look at id3tag.pc to make sure the path was updated), 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 libid3tag0 depends on: ii libc6 2.13-38 ii zlib1g 1:1.2.7.dfsg-13 libid3tag0 recommends no packages. libid3tag0 suggests no packages. -- no debconf information
diff --git a/debian/control b/debian/control index 485bf76..fb5a9d4 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,16 @@ Source: libid3tag Priority: optional Section: sound -Build-Depends: cdbs, dpatch, debhelper (>= 4.1.0), gettext, zlib1g-dev, gperf +Build-Depends: cdbs (>= 0.4.93~), dpatch, debhelper (>= 8.1.3), gettext, zlib1g-dev, gperf Maintainer: Mad Maintainers <[email protected]> Uploaders: Sam Clegg <[email protected]>, Kurt Roeckx <[email protected]>, Clément Stenac <[email protected]> Standards-Version: 3.6.1 Package: libid3tag0 Architecture: any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends} Description: ID3 tag reading library from the MAD project ID3 tag manipulation library with full support for reading ID3v1, ID3v1.1, diff --git a/debian/id3tag.pc b/debian/id3tag.pc index e686000..3dfe513 100644 --- a/debian/id3tag.pc +++ b/debian/id3tag.pc @@ -1,6 +1,6 @@ prefix=/usr exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=${exec_prefix}/lib/@DEB_HOST_MULTIARCH@ includedir=${prefix}/include Name: id3tag diff --git a/debian/libid3tag0-dev.install b/debian/libid3tag0-dev.install index 562b9f8..c1a37c9 100644 --- a/debian/libid3tag0-dev.install +++ b/debian/libid3tag0-dev.install @@ -1,5 +1,4 @@ -debian/tmp/usr/include/id3tag.h /usr/include -debian/tmp/usr/lib/libid3tag.a /usr/lib -debian/tmp/usr/lib/libid3tag.la /usr/lib -debian/tmp/usr/lib/libid3tag.so /usr/lib -debian/id3tag.pc /usr/lib/pkgconfig +debian/tmp/usr/include/id3tag.h +debian/tmp/usr/lib/*/libid3tag.a +debian/tmp/usr/lib/*/libid3tag.la +debian/tmp/usr/lib/*/libid3tag.so diff --git a/debian/libid3tag0.install b/debian/libid3tag0.install index 4f7e8bd..75ff743 100644 --- a/debian/libid3tag0.install +++ b/debian/libid3tag0.install @@ -1 +1 @@ -debian/tmp/usr/lib/libid3tag.so.* /usr/lib +debian/tmp/usr/lib/*/libid3tag.so.* diff --git a/debian/rules b/debian/rules index 910b507..a186f18 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,13 @@ else DEB_CONFIGURE_EXTRA_FLAGS += --disable-profiling --disable-debugging endif +DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) + + +install/libid3tag0-dev:: debian/id3tag.pc + mkdir -p debian/$(cdbs_curpkg)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig + sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > debian/$(cdbs_curpkg)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/id3tag.pc + clean:: # annoying lintian errors rm -f config.cache libz/config.log \
