Package: libbluedevil1 Version: 1.9-1 Severity: wishlist Tags: patch Attached is a patch to install the library in multiarch paths.
-- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (990, 'unstable'), (102, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 3.0.0fglrx2 (SMP w/2 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages libbluedevil1 depends on: ii libc6 2.13-11 Embedded GNU C Library: Shared lib ii libgcc1 1:4.6.1-5 GCC support library ii libqt4-dbus 4:4.7.3-5 Qt 4 D-Bus module ii libqtcore4 4:4.7.3-5 Qt 4 core module ii libstdc++6 4.6.1-5 GNU Standard C++ Library v3 libbluedevil1 recommends no packages. libbluedevil1 suggests no packages. -- no debconf information
>From a089ff7c78332177ce0d496224c7ae60492de621 Mon Sep 17 00:00:00 2001 From: Daniel Schaal <farb...@web.de> Date: Sat, 30 Jul 2011 14:34:34 +0200 Subject: [PATCH] install library in multiarch paths + switch to debhelper v9 compat + patch CMakeLists.txt and bluedevil.pc.in to use multiarch lib path + change /usr/lib/ to /usr/lib/*/ in .install files + add Multi-Arch: same to library package --- 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 +- 7 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 debian/patches/03_use_multiarch_lib_paths.diff 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-ext...@lists.alioth.debian.org> Uploaders: Florian Reinhard <florian.reinh...@googlemail.com>, George Kiagiadakis <kiagiadakis.geo...@gmail.com>, Mark Purcell <m...@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 -- 1.7.5.4
