[SCM] gavl/master: Introduce Multi-Arch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d33e347e62c44f24197237f1126d8623cb46ce59
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 17 19:07:17 2012 +0100

    Introduce Multi-Arch.

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 b8aa033..ac69d07 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Free Ekanayaka <freee at debian.org>,
 DM-Upload-Allowed: yes
 Homepage: http://gmerlin.sourceforge.net/
 Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.3~),
  doxygen,
  automake,
  libtool,
@@ -19,6 +19,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/gavl.git
 
 Package: libgavl1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: low level audio and video library - runtime files
@@ -37,6 +39,7 @@ Description: low level audio and video library - runtime files
 Package: libgavl1-dbg
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Section: debug
 Depends: libgavl1 (= ${binary:Version}),
  ${misc:Depends}
@@ -53,10 +56,11 @@ Description: debugging symbols for libgavl1
  This package contains the debugging symbols for libgavl1
 
 Package: libgavl-dev
-Architecture: all
+Architecture: any
+Multi-Arch: same
 Section: libdevel
-Depends: libgavl1 (>= ${source:Version}),
- libgavl1 (<< ${source:Upstream-Version}+1~),
+Depends:
+ libgavl1 (= ${binary:Version}),
  pkg-config,
  ${misc:Depends}
 Recommends: libgavl-doc
diff --git a/debian/libgavl-dev.install b/debian/libgavl-dev.install
index 546c28a..89ee303 100644
--- a/debian/libgavl-dev.install
+++ b/debian/libgavl-dev.install
@@ -1,3 +1,3 @@
 debian/tmp/usr/include
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/libgavl.so
+debian/tmp/usr/lib/*/pkgconfig
+debian/tmp/usr/lib/*/libgavl.so
diff --git a/debian/libgavl1.install b/debian/libgavl1.install
index 380dae4..7c3c9a2 100644
--- a/debian/libgavl1.install
+++ b/debian/libgavl1.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libgavl.so.1*
+debian/tmp/usr/lib/*/libgavl.so.1*

-- 
gavl packaging