[SCM] portmidi/master: Multiarchify packages.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1628b50b80d5bc490f9b88dd9be41ad07a07dea1
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Oct 16 14:18:48 2014 +0100

    Multiarchify packages.

diff --git a/debian/control b/debian/control
index e4d4d03..6b55396 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Uploaders:
  Alessio Treglia <alessio at debian.org>
 Build-Depends:
  debhelper (>= 9~),
+ dh-exec,
  libasound2-dev
 Standards-Version: 3.9.6
 Homepage: http://portmedia.sourceforge.net/
@@ -16,6 +17,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-multimedia/advene.git
 Package: libportmidi-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends:
  libportmidi0 (= ${binary:Version}),
  ${misc:Depends},
@@ -28,6 +30,8 @@ Description: library for real-time MIDI input/output - development files
 Package: libportmidi0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
diff --git a/debian/libportmidi-dev.install b/debian/libportmidi-dev.install
index d1bffed..a3c8f6c 100644
--- a/debian/libportmidi-dev.install
+++ b/debian/libportmidi-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
diff --git a/debian/libportmidi-dev.links b/debian/libportmidi-dev.links
old mode 100644
new mode 100755
index f3272eb..24ec505
--- a/debian/libportmidi-dev.links
+++ b/debian/libportmidi-dev.links
@@ -1,2 +1,4 @@
-usr/lib/libportmidi.so.0.0.0 usr/lib/libportmidi.so
-usr/lib/libporttime.so.0.0.0 usr/lib/libporttime.so
+#!/usr/bin/dh-exec
+
+usr/lib/${DEB_HOST_MULTIARCH}/libportmidi.so.0.0.0 usr/lib/${DEB_HOST_MULTIARCH}/libportmidi.so
+usr/lib/${DEB_HOST_MULTIARCH}/libporttime.so.0.0.0 usr/lib/${DEB_HOST_MULTIARCH}/libporttime.so
diff --git a/debian/libportmidi0.install b/debian/libportmidi0.install
index d0dbfd1..3ddde58 100644
--- a/debian/libportmidi0.install
+++ b/debian/libportmidi0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libportmidi0.links b/debian/libportmidi0.links
old mode 100644
new mode 100755
index dec8cfb..2ae6412
--- a/debian/libportmidi0.links
+++ b/debian/libportmidi0.links
@@ -1,2 +1,4 @@
-usr/lib/libportmidi.so.0.0.0 usr/lib/libportmidi.so.0
-usr/lib/libporttime.so.0.0.0 usr/lib/libporttime.so.0
+#!/usr/bin/dh-exec
+
+usr/lib/${DEB_HOST_MULTIARCH}/libportmidi.so.0.0.0 usr/lib/${DEB_HOST_MULTIARCH}/libportmidi.so.0
+usr/lib/${DEB_HOST_MULTIARCH}/libporttime.so.0.0.0 usr/lib/${DEB_HOST_MULTIARCH}/libporttime.so.0
diff --git a/debian/rules b/debian/rules
index 51e6131..af490eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,15 @@
 #!/usr/bin/make -f
 
-export CFLAGS += -Wall -g -fPIC
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+export CFLAGS += -fPIC
+export CPPFLAGS += $(CXXFLAGS)
+
+export LIBDIR = lib/$(DEB_HOST_MULTIARCH)
 
 version=`ls pm_linux/lib*.so.* | \
  awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`

-- 
portmidi packaging