[SCM] libbluedevil packaging branch, kubuntu_unstable, updated. debian/1.9.3-1-12-g9e16f35

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 9e16f3549d5f266428a393f2db6fa5f04af9775f
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Jan 12 19:54:10 2015 +0100

    drop all patches, not applicable anymore due to kf5 port
---
 debian/patches/01_findqt4_optional_x11_pthread.diff | 19 -------------------
 debian/patches/03_use_multiarch_lib_paths.diff      | 21 ---------------------
 debian/patches/series                               |  2 --
 3 files changed, 42 deletions(-)

diff --git a/debian/patches/01_findqt4_optional_x11_pthread.diff b/debian/patches/01_findqt4_optional_x11_pthread.diff
deleted file mode 100644
index 0782be4..0000000
--- a/debian/patches/01_findqt4_optional_x11_pthread.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Qt doesn't expose the X11 headers to the world, so no need to make it required.
----
- cmake/modules/Qt4ConfigDependentSettings.cmake |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/cmake/modules/Qt4ConfigDependentSettings.cmake
-+++ b/cmake/modules/Qt4ConfigDependentSettings.cmake
-@@ -27,10 +27,9 @@
- IF(UNIX)
-   # on OS X X11 may not be required
-   IF (Q_WS_X11)
--    FIND_PACKAGE(X11 REQUIRED)
-+    FIND_PACKAGE(X11)
-   ENDIF (Q_WS_X11)
-   FIND_PACKAGE(Threads)
--  SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
- ENDIF(UNIX)
- 
- 
diff --git a/debian/patches/03_use_multiarch_lib_paths.diff b/debian/patches/03_use_multiarch_lib_paths.diff
deleted file mode 100644
index b6c3ff1..0000000
--- a/debian/patches/03_use_multiarch_lib_paths.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: Daniel Schaal <farbing at web.de>
-Description: Set a multi-arch library directory.
-Last-Update: 2014-03-31
-Forwarded: no
-Bug-Debian: http://bugs.debian.org/636042
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -22,10 +22,10 @@ endif (_HAVE_VISIBILITY AND NOT WIN32)
- #
- ### 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}"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2ab1425..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01_findqt4_optional_x11_pthread.diff
-03_use_multiarch_lib_paths.diff

-- 
libbluedevil packaging