[SCM] gmtk/master: Add multiarch support

[sramacher-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 73196d89ca01610db82aee261640626014ebb1cd
Author: Sebastian Ramacher <s.ramacher at gmx.at>
Date:   Mon Jan 2 16:20:35 2012 +0100

    Add multiarch support
    
    debian/compat: bump compat to 9
    debian/control:
      * add Multi-Arch fields where appropriate
      * Build-Dep on debhelper (>= 8.1.3~)
    debian/*.install: update paths
    debian/source.lintian-overrides: override package-needs-versioned-debhelper-build-depends

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 7e0d9b2..4c0a108 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org> 
 Uploaders: Brandon Snider <brandonjsnider at gmail.com>, Sebastian Ramacher <s.ramacher at gmx.at>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.3~),
  dh-autoreconf,
  intltool, 
  pkg-config,
@@ -19,7 +19,10 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/gmtk.git
 
 Package: libgmtk0
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libgmtk0-data (= ${source:Version})
 Description: gnome-mplayer toolkit (runtime library)
  libgmtk - a set of gtk widgets to use with gnome-mplayer. This library is needed when 
  Gnome-Mplayer or Gecko-Mediaplayer are being used.
@@ -35,6 +38,8 @@ Description: gnome-mpayer toolkit (debugging symbols)
 
 Package: libgmlib0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: gnome-mplayer library (runtime library)
  libgmlib - a set of functions that support non-graphical operations. This is
@@ -70,3 +75,10 @@ Depends: ${misc:Depends},
  libglib2.0-dev
 Description: gnome-mplayer library (development files)
  This package installs development headers for gmlib.
+
+Package: libgmtk0-data
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: gnome-mplayer toolkit (common files)
+ This package contains common files for gmtk.
diff --git a/debian/libgmlib-dev.install b/debian/libgmlib-dev.install
index 0e93fce..ad43352 100644
--- a/debian/libgmlib-dev.install
+++ b/debian/libgmlib-dev.install
@@ -1,5 +1,4 @@
 usr/include/gmtk/gmlib.h
 usr/include/gmtk/gm_*.h
-usr/lib/libgmlib.so
-usr/lib/libgmlib*.a
-usr/lib/pkgconfig/gmlib.pc
+usr/lib/*/libgmlib.so
+usr/lib/*/pkgconfig/gmlib.pc
diff --git a/debian/libgmlib0.install b/debian/libgmlib0.install
index d8aa832..f71a43d 100644
--- a/debian/libgmlib0.install
+++ b/debian/libgmlib0.install
@@ -1 +1 @@
-usr/lib/libgmlib.so.*
+usr/lib/*/libgmlib.so.*
diff --git a/debian/libgmtk-dev.install b/debian/libgmtk-dev.install
index 694e3eb..6c7e52d 100644
--- a/debian/libgmtk-dev.install
+++ b/debian/libgmtk-dev.install
@@ -1,4 +1,3 @@
 usr/include/gmtk/gmtk*.h
-usr/lib/libgmtk.so
-usr/lib/libgmtk*.a
-usr/lib/pkgconfig/gmtk.pc
+usr/lib/*/libgmtk.so
+usr/lib/*/pkgconfig/gmtk.pc
diff --git a/debian/libgmtk0-data.install b/debian/libgmtk0-data.install
new file mode 100644
index 0000000..9591896
--- /dev/null
+++ b/debian/libgmtk0-data.install
@@ -0,0 +1 @@
+usr/share/locale/*/LC_MESSAGES/gmtk.mo
diff --git a/debian/libgmtk0.install b/debian/libgmtk0.install
index 233a2e4..ce7b0c7 100644
--- a/debian/libgmtk0.install
+++ b/debian/libgmtk0.install
@@ -1 +1 @@
-usr/lib/libgmtk.so.*
+usr/lib/*/libgmtk.so.*
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..4c9ca41
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1 @@
+package-needs-versioned-debhelper-build-depends 9

-- 
gmtk packaging