Your message dated Tue, 03 Apr 2012 10:48:33 +0000
with message-id <e1sf1ht-0004qs...@franck.debian.org>
and subject line Bug#636042: fixed in libbluedevil 1.9.1-1
has caused the Debian Bug report #636042,
regarding libbluedevil1: install library in multiarch path
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
636042: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636042
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
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-extras@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


--- End Message ---
--- Begin Message ---
Source: libbluedevil
Source-Version: 1.9.1-1

We believe that the bug you reported is fixed in the latest version of
libbluedevil, which is due to be installed in the Debian FTP archive:

libbluedevil-dev_1.9.1-1_amd64.deb
  to main/libb/libbluedevil/libbluedevil-dev_1.9.1-1_amd64.deb
libbluedevil1_1.9.1-1_amd64.deb
  to main/libb/libbluedevil/libbluedevil1_1.9.1-1_amd64.deb
libbluedevil_1.9.1-1.debian.tar.gz
  to main/libb/libbluedevil/libbluedevil_1.9.1-1.debian.tar.gz
libbluedevil_1.9.1-1.dsc
  to main/libb/libbluedevil/libbluedevil_1.9.1-1.dsc
libbluedevil_1.9.1.orig.tar.bz2
  to main/libb/libbluedevil/libbluedevil_1.9.1.orig.tar.bz2



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 636...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Pino Toscano <p...@debian.org> (supplier of updated libbluedevil package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Tue, 03 Apr 2012 12:12:53 +0200
Source: libbluedevil
Binary: libbluedevil-dev libbluedevil1
Architecture: source amd64
Version: 1.9.1-1
Distribution: unstable
Urgency: low
Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Changed-By: Pino Toscano <p...@debian.org>
Description: 
 libbluedevil-dev - development files for libbluedevil
 libbluedevil1 - Qt wrapper for bluez
Closes: 636042
Changes: 
 libbluedevil (1.9.1-1) unstable; urgency=low
 .
   * Team upload.
   * New upstream release.
 .
   [ George Kiagiadakis ]
   * Convert to multiarch; patch from Daniel Schaal (Closes: #636042)
 .
   [ Pino Toscano ]
   * Fix watch file.
   * Update the patches:
     - 02_hidden_visibility.diff: drop, no more required.
     - 03_use_multiarch_lib_paths.diff: refresh, add DEP3 headers, remove part
       concerning the pkg-config file
     - upstream_use-LIB_INSTALL_DIR.patch: backport upstream commit to
       properly set "libdir" in the pkg-config file
   * Bump debhelper build dependency to 9.
   * Bump Standards-Version to 3.9.3, no changes required.
   * Slightly improve the package descriptions.
Checksums-Sha1: 
 7f2b2e29aa6273e17731ab82711392a25c8623d9 1556 libbluedevil_1.9.1-1.dsc
 bcc3b3482195bce94c12f2d6340a6f61cc84ff4e 190260 libbluedevil_1.9.1.orig.tar.bz2
 7dfd702c6239790020c102c985754cf6f09fd120 5966 
libbluedevil_1.9.1-1.debian.tar.gz
 696c21ce6bd88f110a6cfec6cc33f5ab6ffcb553 11808 
libbluedevil-dev_1.9.1-1_amd64.deb
 04f7047c3bd08b22fee5595a1ea34b88c435c9ba 91014 libbluedevil1_1.9.1-1_amd64.deb
Checksums-Sha256: 
 e79ed06d1693cc7394acbb06d3dde8a4a900ed64221ab928b30e82c2321ad6dc 1556 
libbluedevil_1.9.1-1.dsc
 6798fbca4d4cd6c87f553a4ceb93ca31bc4a7a2b134c91bcccf5f0613efe3d23 190260 
libbluedevil_1.9.1.orig.tar.bz2
 82d11a85a37a5bedd38d326e4fb79029b25788b516877a719f457c4a2a33b350 5966 
libbluedevil_1.9.1-1.debian.tar.gz
 a334ddf448f61dbeff04c446a5ae01ee1f25dfbc95fa4e54e3d0579376183200 11808 
libbluedevil-dev_1.9.1-1_amd64.deb
 f1f91bb00ad556d5a857763250d56193ffdd2a6bc84ed10962b7091d3bf8b293 91014 
libbluedevil1_1.9.1-1_amd64.deb
Files: 
 940004ede06153c6d2946b7f73fe56b5 1556 libs optional libbluedevil_1.9.1-1.dsc
 b3f04954f75f78c874cdb462c2454afc 190260 libs optional 
libbluedevil_1.9.1.orig.tar.bz2
 94b38035b1c4f6fdbda255416c3aadbf 5966 libs optional 
libbluedevil_1.9.1-1.debian.tar.gz
 c8c73a354d87a9cedb6b765e354851d0 11808 libdevel optional 
libbluedevil-dev_1.9.1-1_amd64.deb
 07685f91161f0d85ad7a36f249d3fb08 91014 libs optional 
libbluedevil1_1.9.1-1_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iD8DBQFPetN7TNH2piB/L3oRAh6+AKCAwiAM4LA134VJSM/ZCJ4Qy+OfkQCeP0Xx
2FmO8VoyDzKyW3VX+WNUDR0=
=xNDu
-----END PGP SIGNATURE-----



--- End Message ---
_______________________________________________
pkg-kde-extras mailing list
pkg-kde-extras@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-kde-extras

Reply via email to