[Pkg-gstreamer-commits] [SCM] UNNAMED PROJECT branch, master, updated. debian/1%0.4.16-1-3-gc232252

[Alessio Treglia]

The following commit has been merged in the master branch:
commit b8b720949efefb422acdc4b05caa8eba57c018a9
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Apr 26 10:13:53 2012 +0200

    Build for multiarch.
    
    Closes: #651008
    Thanks: William A Van Hevelingen and Miguel A. Colón Vélez for the good work.

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 e15647c..8658e77 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,8 @@ Section: devel
 Priority: optional
 Maintainer: Maintainers of GStreamer packages <pkg-gstreamer-maintainers at lists.alioth.debian.org>
 Uploaders: Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 7),
-               dpkg-dev (>= 1.14.13),
+Build-Depends: cdbs (>= 0.4.93~),
+               debhelper (>= 9),
                autotools-dev,
                gtk-doc-tools
 Standards-Version: 3.9.0
@@ -16,6 +15,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-gstreamer/orc.git
 Package: liborc-0.4-0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: Library of Optimized Inner Loops Runtime Compiler
@@ -50,6 +51,7 @@ Package: liborc-0.4-0-dbg
 Section: debug
 Architecture: any
 Priority: extra
+Multi-Arch: same
 Depends: liborc-0.4-0 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
diff --git a/debian/liborc-0.4-0.install b/debian/liborc-0.4-0.install
index ce1c795..1042058 100644
--- a/debian/liborc-0.4-0.install
+++ b/debian/liborc-0.4-0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/liborc*-0.4.so.*
+debian/tmp/usr/lib/*/liborc*-0.4.so.*
diff --git a/debian/liborc-0.4-dev.install b/debian/liborc-0.4-dev.install
index 10e1260..9fc117e 100644
--- a/debian/liborc-0.4-dev.install
+++ b/debian/liborc-0.4-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/usr/lib/liborc*-0.4.so
-debian/tmp/usr/lib/liborc*-0.4.a
+debian/tmp/usr/lib/*/liborc*-0.4.so
+debian/tmp/usr/lib/*/liborc*-0.4.a
 debian/tmp/usr/include/orc-0.4
-debian/tmp/usr/lib/pkgconfig/orc-0.4.pc
+debian/tmp/usr/lib/*/pkgconfig/orc-0.4.pc
 debian/tmp/usr/bin/orcc
 debian/tmp/usr/bin/orc-bugreport
diff --git a/debian/rules b/debian/rules
index 8c01ad6..4d39965 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,7 @@ include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_DH_STRIP_ARGS := --dbg-package=liborc-0.4-0-dbg
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-static
-
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-static --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 APIVER := 0.4
 SHLIBVER := 1:0.4.16
 liborc := $(shell sed -nr 's/^Package:[[:space:]]*(liborc-$(APIVER)-[0-9]+)[[:space:]]*$$/\1/p' debian/control)

-- 
UNNAMED PROJECT