[SCM] gmerlin-avdecoder/master: Introduce Multi-Arch support.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ecd5ae183a21dbc592581dde2768aadc93ee499e
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 18:35:21 2012 +0200

    Introduce Multi-Arch support.

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.in b/debian/control.in
index e0725e5..a0fd2ee 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -47,6 +47,8 @@ Architecture: any
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: general multimedia decoding library
  Gmerlin_avdecoder is a general purpose media decoding library. It was
  written as a support library for gmerlin, but it can also be used by other
@@ -56,13 +58,13 @@ Description: general multimedia decoding library
  using Gmerlin_avdecoder.
 
 Package: libgmerlin-avdec-dev
-Architecture: all
+Architecture: any
 Section: libdevel
 Depends:
  libgavl-dev,
- libgmerlin-avdec1 (<< ${source:Upstream-Version}+1~),
- libgmerlin-avdec1 (>= ${source:Version}),
+ libgmerlin-avdec1 (= ${binary:Version}),
  ${misc:Depends}
+Multi-Arch: same
 Description: general multimedia decoding library (development files)
  Gmerlin_avdecoder is a general purpose media decoding library. It was
  written as a support library for gmerlin, but it can also be used by other
@@ -89,6 +91,7 @@ Section: debug
 Depends:
  libgmerlin-avdec1 (= ${binary:Version}),
  ${misc:Depends}
+Multi-Arch: same
 Description: debugging symbols for Gmerlin_avdecoder
  Gmerlin_avdecoder is a general purpose media decoding library. It was
  written as a support library for gmerlin, but it can also be used by other
@@ -105,6 +108,7 @@ Depends:
  libgmerlin0 (>= 1.0.0~),
  ${misc:Depends},
  ${shlibs:Depends}
+Multi-Arch: same
 Description: avdecoder plugins for Gmerlin
  Gmerlin_avdecoder is a general purpose media decoding library. It was
  written as a support library for gmerlin, but it can also be used by other
diff --git a/debian/gmerlin-plugins-avdecoder.install b/debian/gmerlin-plugins-avdecoder.install
index 5ceb238..fc9dd7b 100644
--- a/debian/gmerlin-plugins-avdecoder.install
+++ b/debian/gmerlin-plugins-avdecoder.install
@@ -1 +1 @@
-debian/tmp/usr/lib/gmerlin/plugins
+debian/tmp/usr/lib/*/gmerlin/plugins
diff --git a/debian/libgmerlin-avdec-dev.install b/debian/libgmerlin-avdec-dev.install
index d722505..eaec24d 100644
--- a/debian/libgmerlin-avdec-dev.install
+++ b/debian/libgmerlin-avdec-dev.install
@@ -1,3 +1,3 @@
 debian/tmp/usr/include
 debian/tmp/usr/lib/libgmerlin_avdec.so
-debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/*/pkgconfig
diff --git a/debian/libgmerlin-avdec1.install b/debian/libgmerlin-avdec1.install
index 20af2b7..e76db45 100644
--- a/debian/libgmerlin-avdec1.install
+++ b/debian/libgmerlin-avdec1.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libgmerlin_avdec.so.1*
+debian/tmp/usr/lib/*/libgmerlin_avdec.so.1*
 debian/tmp/usr/share/locale

-- 
gmerlin-avdecoder packaging