[SCM] libaacs/master: Revert "Introduce Multi-Arch support." since I'm not sure this properly works with libbluray.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 07102d836e6e21e38fce727151dc117e21539a96
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jan 13 12:26:23 2012 +0100

    Revert "Introduce Multi-Arch support." since I'm not sure this properly works with libbluray.
    
    This reverts commit bf31bbf2805758eecd8e55548a47e33ef3547a53.
    Git-Dch: Ignore

diff --git a/debian/compat b/debian/compat
index ec63514..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+7
diff --git a/debian/control b/debian/control
index eef80f9..d02b69d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Alessio Treglia <alessio at debian.org>
 Build-Depends: bison | byacc,
- debhelper (>= 8.1.3~),
+ debhelper (>= 7.4.10~),
  dh-autoreconf,
  flex,
  libgcrypt11-dev,
@@ -16,8 +16,6 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/libaacs.git
 
 Package: libaacs0
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Enhances: libbluray1
@@ -36,8 +34,6 @@ Package: libaacs0-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: libaacs0 (= ${binary:Version}),
  ${misc:Depends}
 Description: free-and-libre implementation of AACS (debug symbols)
@@ -53,10 +49,9 @@ Description: free-and-libre implementation of AACS (debug symbols)
 
 Package: libaacs-dev
 Section: libdevel
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libaacs0 (= ${binary:Version}),
+Architecture: all
+Depends: libaacs0 (>= ${source:Version}),
+ libaacs0 (<< ${source:Upstream-Version}+1~),
  ${misc:Depends}
 Description: free-and-libre implementation of AACS (development files)
  libaacs is a research project to implement the Advanced Access Content
diff --git a/debian/libaacs-dev.install b/debian/libaacs-dev.install
index c20ece3..a7f4694 100644
--- a/debian/libaacs-dev.install
+++ b/debian/libaacs-dev.install
@@ -1,3 +1,3 @@
 usr/include
-usr/lib/*/pkgconfig
-usr/lib/*/libaacs.so
+usr/lib/pkgconfig
+usr/lib/libaacs.so
diff --git a/debian/libaacs0.install b/debian/libaacs0.install
index 3de3b10..093956b 100644
--- a/debian/libaacs0.install
+++ b/debian/libaacs0.install
@@ -1 +1 @@
-usr/lib/*/*.so.*
+usr/lib/*.so.*

-- 
libaacs packaging