[SCM] libaacs/master: Re-introduce Multi-Arch support: it works.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Feb 13 22:33:32 UTC 2012


The following commit has been merged in the master branch:
commit 69644c0eb681f09ae64579a0e1a6ca42e554e57b
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Feb 13 23:32:29 2012 +0100

    Re-introduce Multi-Arch support: it works.

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 d02b69d..eef80f9 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 (>= 7.4.10~),
+ debhelper (>= 8.1.3~),
  dh-autoreconf,
  flex,
  libgcrypt11-dev,
@@ -16,6 +16,8 @@ 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
@@ -34,6 +36,8 @@ 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)
@@ -49,9 +53,10 @@ Description: free-and-libre implementation of AACS (debug symbols)
 
 Package: libaacs-dev
 Section: libdevel
-Architecture: all
-Depends: libaacs0 (>= ${source:Version}),
- libaacs0 (<< ${source:Upstream-Version}+1~),
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libaacs0 (= ${binary:Version}),
  ${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 a7f4694..c20ece3 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 093956b..3de3b10 100644
--- a/debian/libaacs0.install
+++ b/debian/libaacs0.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*

-- 
libaacs packaging



More information about the pkg-multimedia-commits mailing list