[SCM] rubberband/master: Starting with multiarch support

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

The following commit has been merged in the master branch:
commit 74af05db78d8ce09e233a640a6eef1d04af91dc1
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Sep 24 22:36:39 2012 +0200

    Starting with multiarch support

diff --git a/debian/control b/debian/control
index b162278..a13e015 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,8 @@ Architecture: any
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: audio time-stretching and pitch-shifting library
  Rubber Band is a library and utility program that permits you to
  change the tempo and pitch of an audio recording independently of one
@@ -34,6 +36,7 @@ Architecture: any
 Depends:
  ${misc:Depends},
  librubberband2 (= ${binary:Version})
+Multi-Arch: same
 Description: audio time-stretching and pitch-shifting library (development files)
  Rubber Band is a library and utility program that permits you to
  change the tempo and pitch of an audio recording independently of one
diff --git a/debian/librubberband-dev.install b/debian/librubberband-dev.install
index 6cd8ddd..76f28fa 100644
--- a/debian/librubberband-dev.install
+++ b/debian/librubberband-dev.install
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
diff --git a/debian/librubberband2.install b/debian/librubberband2.install
index b0e9e36..47c1847 100644
--- a/debian/librubberband2.install
+++ b/debian/librubberband2.install
@@ -1 +1 @@
-usr/lib/librubberband.so.*
+usr/lib/*/librubberband.so.*
diff --git a/debian/rules b/debian/rules
index 0579cfc..1783d61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,11 @@
 
 LDFLAGS += -Wl,-O1 -Wl,--as-needed
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export PREFIX=/usr
+export LIBDIR=lib/$(DEB_HOST_MULTIARCH)
+export DESTDIR=$(CURDIR)/debian/tmp
+
 %:
 	dh $@
 

-- 
rubberband packaging