[SCM] extra-cmake-modules packaging branch, master, updated. debian/5.37.0-2-89-geea6c57

Maximiliano Curia maxy at moszumanska.debian.org
Tue Jan 2 18:24:15 UTC 2018


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

The following commit has been merged in the master branch:
commit 946ccc655f2b4d5abc37785317f4c8ff613a24dd
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Apr 24 11:40:33 2015 +0200

    remove upstreamed patch
---
 debian/patches/kubuntu_qtwaylandscanner_binary.diff | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/debian/patches/kubuntu_qtwaylandscanner_binary.diff b/debian/patches/kubuntu_qtwaylandscanner_binary.diff
deleted file mode 100644
index 1474c06..0000000
--- a/debian/patches/kubuntu_qtwaylandscanner_binary.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-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



More information about the pkg-kde-commits mailing list