[SCM] gmerlin-encoders/master: Introduce Multi-Arch support.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 176820ced358cec08d75dcd91306f7d5985b9fe2
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 19:48:05 2012 +0200

    Introduce Multi-Arch support.

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.in b/debian/control.in
index 73e3f31..00e201b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -32,6 +32,8 @@ Depends:
  ${shlibs:Depends}
 Enhances:
  gmerlin
+Multi-Arch: same
+Depends: ${misc:Pre-Depends}
 Description: ffmpeg encoders for Gmerlin
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
@@ -49,6 +51,8 @@ Depends:
  ${shlibs:Depends}
 Enhances:
  gmerlin
+Multi-Arch: same
+Depends: ${misc:Pre-Depends}
 Description: patent-free encoders for Gmerlin
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
diff --git a/debian/gmerlin-encoders-ffmpeg.install b/debian/gmerlin-encoders-ffmpeg.install
index 2822b58..23911d9 100644
--- a/debian/gmerlin-encoders-ffmpeg.install
+++ b/debian/gmerlin-encoders-ffmpeg.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/gmerlin/plugins/e_ffmpeg.so
-debian/tmp/usr/lib/gmerlin/plugins/e_ffmpeg_audio.so
-debian/tmp/usr/lib/gmerlin/plugins/e_ffmpeg_video.so
+debian/tmp/usr/lib/*/gmerlin/plugins/e_ffmpeg.so
+debian/tmp/usr/lib/*/gmerlin/plugins/e_ffmpeg_audio.so
+debian/tmp/usr/lib/*/gmerlin/plugins/e_ffmpeg_video.so
diff --git a/debian/gmerlin-encoders-good.install b/debian/gmerlin-encoders-good.install
index 74367a6..673c20e 100644
--- a/debian/gmerlin-encoders-good.install
+++ b/debian/gmerlin-encoders-good.install
@@ -1,6 +1,6 @@
-debian/tmp/usr/lib/gmerlin/plugins/e_flac.so
-debian/tmp/usr/lib/gmerlin/plugins/e_flacogg.so
-debian/tmp/usr/lib/gmerlin/plugins/e_lame.so
-debian/tmp/usr/lib/gmerlin/plugins/e_speex.so
-debian/tmp/usr/lib/gmerlin/plugins/e_theora.so
-debian/tmp/usr/lib/gmerlin/plugins/e_vorbis.so
+debian/tmp/usr/lib/*/gmerlin/plugins/e_flac.so
+debian/tmp/usr/lib/*/gmerlin/plugins/e_flacogg.so
+debian/tmp/usr/lib/*/gmerlin/plugins/e_lame.so
+debian/tmp/usr/lib/*/gmerlin/plugins/e_speex.so
+debian/tmp/usr/lib/*/gmerlin/plugins/e_theora.so
+debian/tmp/usr/lib/*/gmerlin/plugins/e_vorbis.so
diff --git a/debian/rules b/debian/rules
index 0c824b1..e52efdc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,7 @@ DEB_UPSTREAM_TARBALL_MD5 = 036b074cffb788e9b96ce0068f555aa4
 # Then check manually if everything's ok
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-static=no \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
  --with-cpuflags=none
 DEB_DH_MAKESHLIBS_ARGS_ALL := -- -v$(DEB_UPSTREAM_VERSION)
 
@@ -49,5 +50,5 @@ restorefiles:
 	rm -f debian/restorefiles.tar
 
 common-install-arch::
-	find $(cdbs_curdestdir)/usr/lib/gmerlin/plugins \
+	find $(cdbs_curdestdir)/usr/lib \
 		-name '*.la' -delete

-- 
gmerlin-encoders packaging