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

Pino Toscano pino at alioth.debian.org
Fri Mar 30 16:07:02 UTC 2012


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libbluedevil.git;a=commitdiff;h=fa7961a

The following commit has been merged in the master branch:
commit fa7961ac9bdecfe99f5d1eb175b920153d6c0841
Author: Pino Toscano <pino at debian.org>
Date:   Fri Mar 30 17:58:01 2012 +0200

    upstream_use-LIB_INSTALL_DIR.patch: backport upstream commit to properly set "libdir" in the pkg-config file
---
 debian/changelog                                  |    2 +
 debian/patches/series                             |    1 +
 debian/patches/upstream_use-LIB_INSTALL_DIR.patch |   23 +++++++++++++++++++++
 3 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d094cc..ff7488e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ libbluedevil (1.9.1-0r1) UNRELEASED; urgency=low
     - 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
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 30 Jul 2011 20:55:11 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 2ab1425..2c13471 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+upstream_use-LIB_INSTALL_DIR.patch
 01_findqt4_optional_x11_pthread.diff
 03_use_multiarch_lib_paths.diff
diff --git a/debian/patches/upstream_use-LIB_INSTALL_DIR.patch b/debian/patches/upstream_use-LIB_INSTALL_DIR.patch
new file mode 100644
index 0000000..5079659
--- /dev/null
+++ b/debian/patches/upstream_use-LIB_INSTALL_DIR.patch
@@ -0,0 +1,23 @@
+From 787999b244144b79f2ea7c8f3df9917187c780aa Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Fri, 30 Mar 2012 17:52:03 +0200
+Subject: [PATCH] use LIB_INSTALL_DIR
+
+---
+ bluedevil/bluedevil.pc.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/bluedevil/bluedevil.pc.in b/bluedevil/bluedevil.pc.in
+index 0d61c02..e6742bd 100644
+--- a/bluedevil/bluedevil.pc.in
++++ b/bluedevil/bluedevil.pc.in
+@@ -1,5 +1,5 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
++libdir=@LIB_INSTALL_DIR@
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+ 
+ Name: bluedevil
+-- 
+1.7.9.1
+

-- 
libbluedevil packaging



More information about the pkg-kde-commits mailing list