[Pkg-gstreamer-commits] [SCM] UNNAMED PROJECT branch, master, updated. debian/1.0.11-1-3-g36be02d

[Alessio Treglia]

The following commit has been merged in the master branch:
commit 36be02d9ca39b8e316481effabef852556d7da5f
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Apr 26 08:03:45 2012 +0200

    Convert to Multi-Arch.
    
    Thanks: Miguel A. Colón Vélez.
    Closes: #663046

diff --git a/debian/control b/debian/control
index e695941..2d754be 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
 Priority: optional
 Maintainer: Maintainers of GStreamer packages <pkg-gstreamer-maintainers at lists.alioth.debian.org>
 Uploaders: Sebastian Dröge <slomo at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 7),
+Build-Depends: cdbs (0.4.93~),
+               debhelper (>= 8.1.3~),
                liborc-0.4-dev (>= 1:0.4.16),
                pkg-config
 Build-Depends-Indep: gtk-doc-tools (>= 1.0)
@@ -14,6 +14,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-gstreamer/schroedinger.git
 
 Package: libschroedinger-1.0-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Description: library for encoding/decoding of Dirac video streams
@@ -26,6 +28,7 @@ Description: library for encoding/decoding of Dirac video streams
 
 Package: libschroedinger-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: liborc-0.4-dev (>= 1:0.4.16),
          libschroedinger-1.0-0 (= ${binary:Version}),
diff --git a/debian/libschroedinger-1.0-0.install b/debian/libschroedinger-1.0-0.install
index 093ea1e..58672b2 100644
--- a/debian/libschroedinger-1.0-0.install
+++ b/debian/libschroedinger-1.0-0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libschroedinger-1.0.so.*
+debian/tmp/usr/lib/*/libschroedinger-1.0.so.*
diff --git a/debian/libschroedinger-dev.install b/debian/libschroedinger-dev.install
index f17029e..8dbe5ba 100644
--- a/debian/libschroedinger-dev.install
+++ b/debian/libschroedinger-dev.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/include
-debian/tmp/usr/lib/libschroedinger-1.0.a
-debian/tmp/usr/lib/libschroedinger-1.0.so
-debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/*/libschroedinger-1.0.a
+debian/tmp/usr/lib/*/libschroedinger-1.0.so
+debian/tmp/usr/lib/*/pkgconfig
diff --git a/debian/rules b/debian/rules
index 68e483c..fe560ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,11 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 common-binary-post-install-arch:: list-missing
 
-DEB_SHLIBDEPS_INCLUDE := debian/libschroedinger-1.0-0/usr/lib
+DEB_SHLIBDEPS_INCLUDE := debian/libschroedinger-1.0-0/usr/lib/$(DEB_HOST_MULTIARCH)
 DEB_DH_MAKESHLIBS_ARGS_ALL += -- -c4
 

-- 
UNNAMED PROJECT