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

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


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

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

    03_use_multiarch_lib_paths.diff: refresh, add DEP3 headers, remove part concerning the pkg-config file
---
 debian/changelog                               |    2 +
 debian/patches/03_use_multiarch_lib_paths.diff |   25 ++++++++---------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7a4a1ef..9d094cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ libbluedevil (1.9.1-0r1) UNRELEASED; urgency=low
   * 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
 
  -- 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/03_use_multiarch_lib_paths.diff b/debian/patches/03_use_multiarch_lib_paths.diff
index 291ee23..65a433f 100644
--- a/debian/patches/03_use_multiarch_lib_paths.diff
+++ b/debian/patches/03_use_multiarch_lib_paths.diff
@@ -1,8 +1,12 @@
-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 @@
+Author: Daniel Schaal <farbing at web.de>
+Description: Set a multi-arch library directory.
+Last-Update: 2012-03-30
+Forwarded: no
+Bug-Debian: http://bugs.debian.org/636042
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,10 +20,10 @@ endif (_HAVE_VISIBILITY AND NOT WIN32)
  #
  ### lib64/32 support kde like
  #
@@ -15,14 +19,3 @@ Index: libbluedevil/CMakeLists.txt
  
  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

-- 
libbluedevil packaging



More information about the pkg-kde-commits mailing list