[SCM] extra-cmake-modules packaging branch, kubuntu_unstable, updated. debian/1.6.1-1-11-gda0403b

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/extra-cmake-modules.git;a=commitdiff;h=da0403b

The following commit has been merged in the kubuntu_unstable branch:
commit da0403b07ab98883e2162a31beaf3b90a080cdba
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Feb 11 14:43:16 2015 +0100

    Add kubuntu_qtwaylandscanner_binary.diff to fine qtwaylandscanner
---
 debian/changelog                                    |  6 ++++++
 debian/patches/kubuntu_qtwaylandscanner_binary.diff | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 91d9aad..0b9fde4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+extra-cmake-modules (1.7.0-0ubuntu2) vivid; urgency=medium
+
+  * Add kubuntu_qtwaylandscanner_binary.diff to fine qtwaylandscanner
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 11 Feb 2015 14:42:55 +0100
+
 extra-cmake-modules (1.7.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/kubuntu_qtwaylandscanner_binary.diff b/debian/patches/kubuntu_qtwaylandscanner_binary.diff
new file mode 100644
index 0000000..1474c06
--- /dev/null
+++ b/debian/patches/kubuntu_qtwaylandscanner_binary.diff
@@ -0,0 +1,19 @@
+Description: add path for qtwaylandscanner
+Author: Jonathan Riddell <jriddell at ubuntu.com>
+Origin: upstream, https://git.reviewboard.kde.org/r/122526/
+Last-Update: 2015-02-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/find-modules/FindQtWaylandScanner.cmake b/find-modules/FindQtWaylandScanner.cmake
+index 28a4fda..b11b552 100644
+--- a/find-modules/FindQtWaylandScanner.cmake
++++ b/find-modules/FindQtWaylandScanner.cmake
+@@ -90,7 +90,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
+ ecm_find_package_version_check(QtWaylandScanner)
+ 
+ # Find qtwaylandscanner
+-find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner)
++find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner PATHS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/)
+ 
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(QtWaylandScanner

-- 
extra-cmake-modules packaging