[SCM] libmatroska/master: debian/: Multi-Arch support added

[mfv-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 342ef68b8df9ca0d4ddf038b083c44d4e0973b5d
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Tue Feb 14 14:59:35 2012 +0100

    debian/: Multi-Arch support added

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 dfd60c6..ba1f3f4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,24 @@ Source: libmatroska
 Section: devel
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
+Uploaders:
+ Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
  Rico Tzschichholz <ricotz at ubuntu.com>,
  Matteo F. Vescovi <mfv.debian at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~),
- libebml-dev (>= 1.2.1)
+Build-Depends:
+ debhelper (>= 9),
+ libebml-dev (>= 1.2.0)
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-multimedia/libmatroska.git
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libmatroska.git;a=summary
+Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libmatroska.git
 Homepage: http://www.matroska.org/
 
 Package: libmatroska5
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${shlibs:Depends},
  ${misc:Depends}
 Description: extensible open standard audio/video container format (shared library)
  Matroska is aiming to become the standard of Multimedia
@@ -30,7 +34,9 @@ Description: extensible open standard audio/video container format (shared libra
 Package: libmatroska-dev
 Section: libdevel
 Architecture: any
-Depends: libmatroska5 (= ${binary:Version}),
+Multi-Arch: same
+Depends:
+ libmatroska5 (= ${binary:Version}),
  libebml-dev (>= 1.2.0),
  ${misc:Depends}
 Description: extensible open standard audio/video container format (development files)
diff --git a/debian/libmatroska-dev.install b/debian/libmatroska-dev.install
index 8dde39e..471e7e4 100644
--- a/debian/libmatroska-dev.install
+++ b/debian/libmatroska-dev.install
@@ -1,3 +1,3 @@
-/usr/include
-/usr/lib/*.so
-/usr/lib/*.a
+usr/include
+usr/lib/*/*.so
+usr/lib/*/*.a
diff --git a/debian/libmatroska5.install b/debian/libmatroska5.install
index eeaf559..3ddde58 100644
--- a/debian/libmatroska5.install
+++ b/debian/libmatroska5.install
@@ -1 +1 @@
-/usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

-- 
libmatroska packaging