[SCM] libavc1394/master: Build with Multiarch support.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Feb 8 19:58:11 UTC 2012


The following commit has been merged in the master branch:
commit d9dcb251989f27f8aff37c881f9c56555e6e274b
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Feb 8 20:58:17 2012 +0100

    Build with Multiarch support.
    
    Closes: #651010

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 8ee5459..35fb592 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders:
  Alessio Treglia <alessio at debian.org>
 Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 8.1.3~),
  dh-autoreconf,
  libraw1394-dev (>= 0.10.1),
  pkg-config
@@ -17,6 +17,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/libavc1394.git
 Package: libavc1394-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends:
  libavc1394-0 (= ${binary:Version}),
  ${misc:Depends},
@@ -39,6 +40,8 @@ Description: control IEEE 1394 audio/video devices (development files)
 
 Package: libavc1394-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
diff --git a/debian/libavc1394-0.install b/debian/libavc1394-0.install
index d0dbfd1..3ddde58 100644
--- a/debian/libavc1394-0.install
+++ b/debian/libavc1394-0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libavc1394-dev.install b/debian/libavc1394-dev.install
index 9d4598d..90d8c98 100644
--- a/debian/libavc1394-dev.install
+++ b/debian/libavc1394-dev.install
@@ -1,3 +1,3 @@
 usr/include
-usr/lib/*.so
-usr/lib/pkgconfig
+usr/lib/*/*.so
+usr/lib/*/pkgconfig

-- 
libavc1394 packaging



More information about the pkg-multimedia-commits mailing list