[SCM] swami/master: Build with Multiarch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 239740b09877fa19f0a15434cd757a0cae8fa641
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Feb 12 23:18:15 2012 +0100

    Build with Multiarch.

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 9e8309a..8605e8b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
  Jaromír Mikeš <mira.mikes at seznam.cz>
 Build-Depends:
  cmake,
- debhelper (>= 7.0.50~),
+ debhelper (>= 8.1.3~),
  docbook-xml,
  gettext,
  gtk-doc-tools,
@@ -45,6 +45,8 @@ Description: MIDI instrument editor application
 Package: libswami0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -58,13 +60,13 @@ Description: MIDI instrument editor - shared libraries
 
 Package: libswami-dev
 Section: libdevel
-Architecture: all
+Architecture: any
+Multi-Arch: same
 Depends:
  libgnomecanvas2-dev (>= 2.0),
  libgtk2.0-dev (>= 2.8.17),
  libinstpatch-dev,
- libswami0 (<< ${source:Upstream-Version}+1~),
- libswami0 (>= ${source:Version}),
+ libswami0 (= ${binary:Version}),
  ${misc:Depends}
 Description: MIDI instrument editor - development files
  Swami (Sampled Waveforms And Musical Instruments) is an application
@@ -78,6 +80,7 @@ Package: swami-dbg
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends:
  libswami0 (= ${binary:Version}),
  swami (= ${binary:Version}),
diff --git a/debian/libswami-dev.install b/debian/libswami-dev.install
deleted file mode 100644
index 90a4881..0000000
--- a/debian/libswami-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.so
diff --git a/debian/libswami0.install b/debian/libswami0.install
deleted file mode 100644
index b184298..0000000
--- a/debian/libswami0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/lib*.so.*
-debian/tmp/usr/lib/swami/*.so
diff --git a/debian/rules b/debian/rules
index a59c02c..3dc359f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,16 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@ --parallel -Scmake
 
+override_dh_install:
+	dh_install -plibswami-dev usr/include
+	dh_install -plibswami-dev usr/lib/lib*.so usr/lib/$(DEB_HOST_MULTIARCH)/
+	dh_install -plibswami0 usr/lib/lib*.so.* usr/lib/$(DEB_HOST_MULTIARCH)/
+	dh_install -plibswami0 usr/lib/swami usr/lib/$(DEB_HOST_MULTIARCH)/
+	dh_install --remaining-packages
+
 override_dh_strip:
 	dh_strip --dbg-package=swami-dbg

-- 
swami packaging