Bug#637582: Please transition flac for multiarch

[Steve Langasek]

Package: flac
Version: 1.2.1-4
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

Hi folks,

Please find attached a patch to flac to transition it to use of the
multiarch library paths as described at
<http://wiki.debian.org/Multiarch/Implementation>.  This patch has been
tested and included in Ubuntu Oneiric.  I would encourage you to apply this
patch in Debian as well, since flac is pretty low in the audio stack
included in ia32-libs, which we would like to get rid of for wheezy.

Note that I have examined the -dev packages and confirmed that they contain
no architecture-specific headers, so I have marked these packages
Multi-Arch: same in addition to the runtime library packages.

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/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
=== modified file 'debian/compat'
--- debian/compat	2010-06-15 14:37:46 +0000
+++ debian/compat	2011-08-12 19:18:58 +0000
@@ -1 +1 @@
-7
+9

=== modified file 'debian/control'
--- debian/control	2011-07-09 11:51:59 +0000
+++ debian/control	2011-08-12 19:18:58 +0000
@@ -5,7 +5,7 @@
 Uploaders: Joshua Kwan <joshk at triplehelix.org>,
  Fabian Greffrath <fabian+debian at greffrath.com>
 Build-Depends: autotools-dev,
- debhelper (>= 7.0.50~),
+ debhelper (>= 8.1.3),
  dh-autoreconf,
  docbook-to-man,
  doxygen,
@@ -39,6 +40,8 @@
 Package: libflac8
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: Free Lossless Audio Codec - runtime C library
@@ -78,6 +81,7 @@
 Package: libflac-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libflac8 (= ${binary:Version}),
  libogg-dev,
  ${misc:Depends}
@@ -98,6 +102,8 @@
 Package: libflac++6
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: Free Lossless Audio Codec - C++ runtime library
@@ -117,6 +123,7 @@
 Package: libflac++-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libflac++6 (= ${binary:Version}),
  libflac-dev,
  ${misc:Depends}

=== modified file 'debian/libflac++-dev.install'
--- debian/libflac++-dev.install	2011-07-09 11:51:59 +0000
+++ debian/libflac++-dev.install	2011-08-12 19:18:58 +0000
@@ -1,5 +1,5 @@
-usr/lib/libFLAC++.a
-usr/lib/libFLAC++.so
-usr/lib/pkgconfig/flac++.pc
+usr/lib/*/libFLAC++.a
+usr/lib/*/libFLAC++.so
+usr/lib/*/pkgconfig/flac++.pc
 usr/include/FLAC++
 usr/share/aclocal/libFLAC++.m4

=== modified file 'debian/libflac++6.install'
--- debian/libflac++6.install	2007-05-29 22:56:36 +0000
+++ debian/libflac++6.install	2011-08-12 19:18:58 +0000
@@ -1 +1 @@
-usr/lib/libFLAC++.so.*
+usr/lib/*/libFLAC++.so.*

=== modified file 'debian/libflac-dev.install'
--- debian/libflac-dev.install	2011-07-09 11:51:59 +0000
+++ debian/libflac-dev.install	2011-08-12 19:18:58 +0000
@@ -1,5 +1,5 @@
-usr/lib/libFLAC.a
-usr/lib/libFLAC.so
+usr/lib/*/libFLAC.a
+usr/lib/*/libFLAC.so
 usr/include/FLAC
-usr/lib/pkgconfig/flac.pc
+usr/lib/*/pkgconfig/flac.pc
 usr/share/aclocal/libFLAC.m4

=== modified file 'debian/libflac8.install'
--- debian/libflac8.install	2007-05-29 22:56:36 +0000
+++ debian/libflac8.install	2011-08-12 19:18:58 +0000
@@ -1 +1 @@
-usr/lib/libFLAC.so.*
+usr/lib/*/libFLAC.so.*