[SCM] gmerlin/master: Build for Multiarch

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0926977f3efd277bd8b9d3ed6c293dfa57c9a810
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Feb 10 16:35:36 2012 +0100

    Build for Multiarch
    
    - Split plugins out of main runtime 'gmerlin' package.
    - Bump DH compatibility
    - Set gmerlin-data as Multi-Arch: foreign
    - Add --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) to
      DEB_CONFIGURE_EXTRA_FLAGS

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 4064d44..3660087 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -39,7 +39,8 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends}
 Recommends:
- gmerlin-plugins-avdecoder
+ gmerlin-plugins-avdecoder,
+ gmerlin-plugins-base
 Suggests:
  gmerlin-encoders
 Description: multiformat media player
@@ -64,6 +65,23 @@ Description: multiformat media player
   o Plugin configurator: Configure gmerlin plugins for programs which can't
     do this themselves.
 
+Package: gmerlin-plugins-base
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Enhances: gmerlin
+Description: gmerlin plugins from the "base" set
+ Gmerlin is a multiformat media player with tree-like virtual directory
+ structure, where you can save your files, webstreams or whatever. It
+ handles even large media collections gracefully. Hardware devices appear
+ also in the tree so you can open Audio-CDs, (S)VCDs, DVDs and
+ DVB-broadcasts.
+ .
+ This package provides the gmerlin plugins from the "base" set.
+
 Package: gmerlin-doc
 Architecture: all
 Section: doc
@@ -80,9 +98,10 @@ Description: multiformat media player - documentation files
 
 Package: gmerlin-data
 Architecture: all
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
- ${misc:Depends},
- ${shlibs:Depends}
+ ${misc:Depends}
 Description: multiformat media player - data files
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
@@ -94,6 +113,7 @@ Description: multiformat media player - data files
 
 Package: gmerlin-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Depends:
  gmerlin (= ${binary:Version}),
@@ -109,8 +129,10 @@ Description: debugging symbols for gmerlin
  This package contains the debugging symbols for gmerlin.
 
 Package: libgmerlin0
-Architecture: any
 Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -126,8 +148,10 @@ Description: core library for gmerlin - runtime files
  libgmerlin.
 
 Package: libgmerlin-common
-Architecture: any
 Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -147,8 +171,9 @@ Description: core library for gmerlin - common runtime files
  This package contains the common files needed by libgmerlin.
 
 Package: libgmerlin-dev
-Architecture: any
 Section: libdevel
+Architecture: any
+Multi-Arch: same
 Depends:
  libgavl-dev (>= 1.2.0),
  libgmerlin0 (= ${binary:Version}),
diff --git a/debian/gmerlin-plugins-base.install b/debian/gmerlin-plugins-base.install
new file mode 100644
index 0000000..984a003
--- /dev/null
+++ b/debian/gmerlin-plugins-base.install
@@ -0,0 +1 @@
+usr/lib/*/gmerlin/plugins
diff --git a/debian/libgmerlin-common.install b/debian/libgmerlin-common.install
index 5b522f4..78ee91a 100644
--- a/debian/libgmerlin-common.install
+++ b/debian/libgmerlin-common.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/gmerlin/bin
-debian/tmp/usr/share/gmerlin/plugin.sym
+usr/lib/*/gmerlin/bin
+usr/share/gmerlin/plugin.sym
diff --git a/debian/libgmerlin-dev.install b/debian/libgmerlin-dev.install
index 17a4b4f..b9d8f4c 100644
--- a/debian/libgmerlin-dev.install
+++ b/debian/libgmerlin-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/include
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/libgmerlin.so
-debian/tmp/usr/lib/libgmerlin_gtk.so
+usr/include
+usr/lib/*/pkgconfig
+usr/lib/*/libgmerlin.so
+usr/lib/*/libgmerlin_gtk.so
diff --git a/debian/libgmerlin0.install b/debian/libgmerlin0.install
index eb9343a..f687275 100644
--- a/debian/libgmerlin0.install
+++ b/debian/libgmerlin0.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libgmerlin.so.0*
-debian/tmp/usr/lib/libgmerlin_gtk.so.0*
+usr/lib/*/libgmerlin.so.0*
+usr/lib/*/libgmerlin_gtk.so.0*
diff --git a/debian/rules b/debian/rules
index 3e3f3ec..0543e83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,7 @@ DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(icons/.*|doc/img/.*|skins/.*/.*|po/.*\.gmo|
 
 
 DEB_CONFIGURE_EXTRA_FLAGS := --docdir=\$${prefix}/share/doc/libgmerlin-doc \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
  --enable-static=no \
  --with-cpuflags=none
 DEB_DH_MAKESHLIBS_ARGS_ALL := -- -v$(DEB_UPSTREAM_VERSION)
@@ -78,4 +79,3 @@ storefiles:
 restorefiles:
 	-test -f debian/restorefiles -a   -f debian/restorefiles.tar && tar -x -f debian/restorefiles.tar -T debian/restorefiles
 	rm -f debian/restorefiles.tar
-

-- 
gmerlin packaging