[SCM] libquicktime/master: Convert to MultiArch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b45a8453c72e9890be14808e1ac183809e960fa0
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Apr 10 10:56:58 2012 +0200

    Convert to MultiArch.

diff --git a/debian/control b/debian/control
index 644f51f..31e0eff 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  autopoint,
  autotools-dev,
  cdbs,
- debhelper (>= 7),
+ debhelper (>= 8.1.3~),
  dh-autoreconf,
  doxygen,
  libasound2-dev [linux-any],
@@ -40,6 +40,8 @@ Homepage: http://libquicktime.sourceforge.net/
 Package: libquicktime2
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -52,6 +54,7 @@ Description: library for reading and writing Quicktime files
 Package: libquicktime-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends:
  libgl1-mesa-dev | libgl-dev,
  libquicktime2 (= ${binary:Version}),
diff --git a/debian/libquicktime-dev.install b/debian/libquicktime-dev.install
index 9d4598d..90d8c98 100644
--- a/debian/libquicktime-dev.install
+++ b/debian/libquicktime-dev.install
@@ -1,3 +1,3 @@
 usr/include
-usr/lib/*.so
-usr/lib/pkgconfig
+usr/lib/*/*.so
+usr/lib/*/pkgconfig
diff --git a/debian/libquicktime2.install b/debian/libquicktime2.install
index 4121863..eab9fcf 100644
--- a/debian/libquicktime2.install
+++ b/debian/libquicktime2.install
@@ -1,3 +1,3 @@
-usr/lib/*.so.*
-usr/lib/libquicktime2/*.so
+usr/lib/*/*.so.*
+usr/lib/*/libquicktime2/*.so
 usr/share/locale
diff --git a/debian/rules b/debian/rules
index 49d895b..757056c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gpl --with-libdv
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gpl --with-libdv --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 DEB_DESTDIR := $(CURDIR)/debian/tmp
 

-- 
libquicktime packaging