[SCM] flac/master: Transition package to multiarch (Closes: #637582)

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 43e290ea7fb4a4242f8c37e1481b623ff19cc6ae
Author: Steve Langasek <steve.langasek at canonical.com>
Date:   Fri Aug 12 21:52:04 2011 +0200

    Transition package to multiarch (Closes: #637582)
    
    This change transitions the package to use the multiarch library paths
    as described at <http://wiki.debian.org/Multiarch/Implementation>.  This
    patch has been tested and included in Ubuntu Oneiric.
    
    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.

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 1d5d201..d2dece5 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 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 +39,8 @@ Description: Free Lossless Audio Codec - command line tools
 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 +80,7 @@ Description: Free Lossless Audio Codec - library documentation
 Package: libflac-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libflac8 (= ${binary:Version}),
  libogg-dev,
  ${misc:Depends}
@@ -98,6 +101,8 @@ Description: Free Lossless Audio Codec - C development library
 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 +122,7 @@ Description: Free Lossless Audio Codec - C++ runtime library
 Package: libflac++-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libflac++6 (= ${binary:Version}),
  libflac-dev,
  ${misc:Depends}
diff --git a/debian/libflac++-dev.install b/debian/libflac++-dev.install
index aceca2c..797ce52 100644
--- a/debian/libflac++-dev.install
+++ b/debian/libflac++-dev.install
@@ -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
diff --git a/debian/libflac++6.install b/debian/libflac++6.install
index 0c82b14..718c765 100644
--- a/debian/libflac++6.install
+++ b/debian/libflac++6.install
@@ -1 +1 @@
-usr/lib/libFLAC++.so.*
+usr/lib/*/libFLAC++.so.*
diff --git a/debian/libflac-dev.install b/debian/libflac-dev.install
index be60804..7d70aa2 100644
--- a/debian/libflac-dev.install
+++ b/debian/libflac-dev.install
@@ -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
diff --git a/debian/libflac8.install b/debian/libflac8.install
index 145fbcb..00dc970 100644
--- a/debian/libflac8.install
+++ b/debian/libflac8.install
@@ -1 +1 @@
-usr/lib/libFLAC.so.*
+usr/lib/*/libFLAC.so.*

-- 
flac packaging