[SCM] libbluedevil packaging branch, master, updated. debian/1.9-1-1-gea845d7

[George Kiagiadakis]

The following commit has been merged in the master branch:
commit ea845d70fe08065932c1f2020817b5cd25c6b1a9
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Sat Jul 30 20:59:24 2011 +0300

    Convert to multiarch; patch from Daniel Schaal (Closes: #636042)
---
 debian/changelog                               |    6 +++++
 debian/compat                                  |    2 +-
 debian/control                                 |    4 ++-
 debian/libbluedevil-dev.install                |    4 +-
 debian/libbluedevil1.install                   |    2 +-
 debian/patches/03_use_multiarch_lib_paths.diff |   28 ++++++++++++++++++++++++
 debian/patches/series                          |    1 +
 debian/rules                                   |    2 +-
 8 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2ed911..9b30512 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libbluedevil (1.9-2) UNRELEASED; urgency=low
+
+  * Convert to multiarch; patch from Daniel Schaal (Closes: #636042)
+
+ -- George Kiagiadakis <kiagiadakis.george at gmail.com>  Sat, 30 Jul 2011 20:55:11 +0300
+
 libbluedevil (1.9-1) unstable; urgency=low
 
   * New upstream release.
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 2e67900..d309880 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libbluedevil
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Florian Reinhard <florian.reinhard at googlemail.com>, George Kiagiadakis <kiagiadakis.george at gmail.com>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 7.3.16), cmake (>= 2.6.4), libqt4-dev (>= 4:4.6.2)
+Build-Depends: debhelper (>= 8.1.3), cmake (>= 2.6.5), libqt4-dev (>= 4:4.6.2)
 Standards-Version: 3.9.2
 Section: libs
 Homepage: https://projects.kde.org/projects/playground/libs/libbluedevil
@@ -19,7 +19,9 @@ Description: Development files for libbluedevil
 
 Package: libbluedevil1
 Architecture: linux-any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: A Qt wrapper for bluez
  libbluedevil is a Qt-style library for accessing the bluez bluetooth stack.
  It is used by the KDE bluetooth stack, BlueDevil.
diff --git a/debian/libbluedevil-dev.install b/debian/libbluedevil-dev.install
index 4e3a43b..3b74705 100644
--- a/debian/libbluedevil-dev.install
+++ b/debian/libbluedevil-dev.install
@@ -1,3 +1,3 @@
-usr/lib/lib*.so
+usr/lib/*/lib*.so
 usr/include/*
-usr/lib/pkgconfig/*
+usr/lib/*/pkgconfig/*
diff --git a/debian/libbluedevil1.install b/debian/libbluedevil1.install
index be393d8..db56abe 100644
--- a/debian/libbluedevil1.install
+++ b/debian/libbluedevil1.install
@@ -1 +1 @@
-usr/lib/libbluedevil.so.1*
+usr/lib/*/libbluedevil.so.1*
diff --git a/debian/patches/03_use_multiarch_lib_paths.diff b/debian/patches/03_use_multiarch_lib_paths.diff
new file mode 100644
index 0000000..291ee23
--- /dev/null
+++ b/debian/patches/03_use_multiarch_lib_paths.diff
@@ -0,0 +1,28 @@
+Index: libbluedevil/CMakeLists.txt
+===================================================================
+--- libbluedevil.orig/CMakeLists.txt	2011-07-30 14:45:21.000000000 +0200
++++ libbluedevil/CMakeLists.txt	2011-07-30 14:45:21.000000000 +0200
+@@ -8,10 +8,10 @@
+ #
+ ### lib64/32 support kde like
+ #
+-set(LIB_SUFFIX "" CACHE STRING "Define suffix for lib directory (32/64)")
++# set(LIB_SUFFIX "" CACHE STRING "Define suffix for lib directory (32/64)")
+ 
+ set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
+-set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
++set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE})
+ 
+ set(INSTALL_TARGETS_DEFAULT_ARGS  RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
+                                   LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
+Index: libbluedevil/bluedevil/bluedevil.pc.in
+===================================================================
+--- libbluedevil.orig/bluedevil/bluedevil.pc.in	2011-07-30 14:45:38.000000000 +0200
++++ libbluedevil/bluedevil/bluedevil.pc.in	2011-07-30 14:46:06.000000000 +0200
+@@ -1,5 +1,5 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
++libdir=@CMAKE_INSTALL_PREFIX@/lib/@CMAKE_LIBRARY_ARCHITECTURE@
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+ 
+ Name: bluedevil
diff --git a/debian/patches/series b/debian/patches/series
index 5619db3..2e77794 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_findqt4_optional_x11_pthread.diff
 02_hidden_visibility.diff
+03_use_multiarch_lib_paths.diff
diff --git a/debian/rules b/debian/rules
index 081903d..c4dbae4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,4 +2,4 @@
 # -*- makefile -*-
 
 %:
-	dh --parallel --buildsystem=cmake $@
+	dh $@ --parallel --buildsystem=cmake

-- 
libbluedevil packaging