[SCM] phat/master: Introduce Multi-Arch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1352aa60b53c4c5fde1a7d45e5cf9c4649c8e6a8
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jan 16 14:38:02 2012 +0100

    Introduce Multi-Arch.

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 e286465..2b805b2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section: graphics
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Alessio Treglia <alessio at debian.org>,
  Jaromír Mikeš <mira.mikes at seznam.cz>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.3~),
  dh-autoreconf,
  autotools-dev (>= 20100122.1),
  libgnomecanvas2-dev,
@@ -19,6 +19,7 @@ Homepage: http://phat.berlios.de/
 Package: libphat-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libphat0 (= ${binary:Version}),
  ${misc:Depends}
 Provides: libphat0-dev
@@ -37,6 +38,8 @@ Description: Development files (headers) for libphat
 Package: libphat0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Suggests: libphat-tools
diff --git a/debian/libphat-dev.install b/debian/libphat-dev.install
index 5774e64..7df81cd 100644
--- a/debian/libphat-dev.install
+++ b/debian/libphat-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/libphat0.install b/debian/libphat0.install
index d0dbfd1..3ddde58 100644
--- a/debian/libphat0.install
+++ b/debian/libphat0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 3e829ce..e8f760e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,5 +8,5 @@ LDFLAGS+=-Wl,--as-needed
 
 override_dh_auto_install:
 	dh_auto_install
-	chrpath -d debian/tmp/usr/lib/lib*.so*
+	chrpath -d debian/tmp/usr/lib/*/lib*.so*
 	chrpath -d debian/tmp/usr/bin/phat*

-- 
phat packaging