[SCM] libdrumstick/master: Build for Multi-Arch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b01afeb1a42724ba541cada4750a57b829682e15
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Feb 5 20:46:56 2012 +0100

    Build for 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 bc61ef9..7c5de48 100644
--- a/debian/control
+++ b/debian/control
@@ -24,10 +24,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libdrumstick.git
 
 Package: libdrumstick-dev
 Section: libdevel
-Architecture: all
+Architecture: any
+Multi-Arch: same
 Depends:
- libdrumstick0 (<< ${source:Upstream-Version}+1~),
- libdrumstick0 (>= ${source:Version}),
+ libdrumstick0 (= ${binary:Version}),
  ${misc:Depends}
 Description: Qt4/C++ wrapper for ALSA Sequencer - development files
  This library is a C++ wrapper around the ALSA library sequencer interface,
@@ -39,6 +39,8 @@ Description: Qt4/C++ wrapper for ALSA Sequencer - development files
 
 Package: libdrumstick0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
@@ -52,6 +54,7 @@ Package: libdrumstick-dbg
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends:
  drumstick-tools (= ${binary:Version}),
  libdrumstick0 (= ${binary:Version}),
diff --git a/debian/libdrumstick-dev.install b/debian/libdrumstick-dev.install
index 5774e64..7df81cd 100644
--- a/debian/libdrumstick-dev.install
+++ b/debian/libdrumstick-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/libdrumstick0.install b/debian/libdrumstick0.install
index d0dbfd1..3ddde58 100644
--- a/debian/libdrumstick0.install
+++ b/debian/libdrumstick0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch
new file mode 100644
index 0000000..936de80
--- /dev/null
+++ b/debian/patches/multiarch.patch
@@ -0,0 +1,65 @@
+Description: Add Multi-Arch support.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ CMakeLists.txt         |    2 +-
+ drumstick-alsa.pc.in   |    2 +-
+ drumstick-file.pc.in   |    2 +-
+ library/CMakeLists.txt |    8 ++++----
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+--- libdrumstick.orig/CMakeLists.txt
++++ libdrumstick/CMakeLists.txt
+@@ -161,7 +161,7 @@ CONFIGURE_FILE(drumstick.spec.in drumsti
+ INSTALL( FILES 
+     ${CMAKE_CURRENT_BINARY_DIR}/drumstick-file.pc
+     ${CMAKE_CURRENT_BINARY_DIR}/drumstick-alsa.pc
+-    DESTINATION lib${LIB_SUFFIX}/pkgconfig )
++    DESTINATION ${LIBDIR}/pkgconfig )
+ 
+ # XML mime types
+ set( SHARED_MIME_INFO_MINIMUM_VERSION "0.30" )
+--- libdrumstick.orig/drumstick-alsa.pc.in
++++ libdrumstick/drumstick-alsa.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@LIB@
++libdir=${prefix}/@LIBDIR@
+ includedir=${prefix}/include/drumstick
+ 
+ Name: drumstick-alsa
+--- libdrumstick.orig/drumstick-file.pc.in
++++ libdrumstick/drumstick-file.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/@LIB@
++libdir=${prefix}/@LIBDIR@
+ includedir=${prefix}/include/drumstick
+ 
+ Name: drumstick-file
+--- libdrumstick.orig/library/CMakeLists.txt
++++ libdrumstick/library/CMakeLists.txt
+@@ -147,8 +147,8 @@ IF(ALSA_FOUND)
+ 
+     INSTALL(TARGETS drumstick-alsa 
+         RUNTIME DESTINATION bin
+-        ARCHIVE DESTINATION lib${LIB_SUFFIX}
+-        LIBRARY DESTINATION lib${LIB_SUFFIX})
++        ARCHIVE DESTINATION ${LIBDIR}
++        LIBRARY DESTINATION ${LIBDIR})
+     INSTALL(FILES ${drumstick-alsa_HEADERS}
+             DESTINATION include/drumstick)
+     INSTALL(FILES include/drumstick.h
+@@ -157,8 +157,8 @@ ENDIF(ALSA_FOUND)
+ 
+ INSTALL(TARGETS drumstick-file
+ 	RUNTIME DESTINATION bin
+-	ARCHIVE DESTINATION lib${LIB_SUFFIX}
+-	LIBRARY DESTINATION lib${LIB_SUFFIX})
++	ARCHIVE DESTINATION ${LIBDIR}
++	LIBRARY DESTINATION ${LIBDIR})
+ 
+ INSTALL(FILES ${drumstick-file_HEADERS}
+         DESTINATION include/drumstick)
diff --git a/debian/patches/series b/debian/patches/series
index e5c1142..48b8535 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 no-lib-suffix.patch
 linker-gold.patch
+multiarch.patch
diff --git a/debian/rules b/debian/rules
index 6d1c9f9..99db848 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,13 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LDFLAGS+=-Wl,--as-needed
 
 %:
 	dh $@ -S cmake
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DLIBDIR=lib/$(DEB_HOST_MULTIARCH)
+
 override_dh_strip:
 	dh_strip --dbg-package=libdrumstick-dbg

-- 
libdrumstick packaging