[SCM] gammaray packaging branch, master, updated. debian/1.3.0-1-30-g8272acb

[Jakub Adam]

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

The following commit has been merged in the master branch:
commit 606c019b504088e4f0e0278bedae1daffcc749a6
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Jan 16 18:03:45 2014 +0100

    Refreshed patches
---
 debian/patches/find-qt5-webkit-5.1.patch | 12 ++++++------
 debian/patches/use-empty-rpath.patch     | 22 +++++-----------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/debian/patches/find-qt5-webkit-5.1.patch b/debian/patches/find-qt5-webkit-5.1.patch
index 05c15b8..4d2f18b 100644
--- a/debian/patches/find-qt5-webkit-5.1.patch
+++ b/debian/patches/find-qt5-webkit-5.1.patch
@@ -7,15 +7,15 @@ Subject: find-qt5-webkit-5.1
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 90fa14c..7d808cc 100644
+index 46e2c60..eaa31d2 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -92,7 +92,7 @@ if(Qt5Core_FOUND)
-   find_package(Qt5Script QUIET)
-   find_package(Qt5ScriptTools QUIET)
-   find_package(Qt5Location QUIET) # workaround for 5.1 webkit that tries to find a qtlocation with a matching version if none (with any version) has been found before...
+@@ -97,7 +97,7 @@ if(Qt5Core_FOUND)
+     Location # workaround for 5.1 webkit that tries to find a qtlocation with a matching version if none (with any version) has been found before...
+     Designer
+   )
 -  find_package(Qt5WebKitWidgets 5.0.2 QUIET) # 5.0.[01] has a code generation bug in uic that fails to generate proper code for webkitwidget classes
 +  find_package(Qt5WebKitWidgets QUIET)
-   find_package(Qt5Designer QUIET)
  
    include("cmake/ECMQt4To5Porting.cmake")
+   # only needed for Qt <= 5.1 and/or some older CMake versions (exact combination unknown unfortunately)
diff --git a/debian/patches/use-empty-rpath.patch b/debian/patches/use-empty-rpath.patch
index a11e94f..45ca351 100644
--- a/debian/patches/use-empty-rpath.patch
+++ b/debian/patches/use-empty-rpath.patch
@@ -3,31 +3,19 @@ Date: Thu, 10 Jan 2013 20:16:29 +0100
 Subject: use-empty-rpath
 
 ---
- CMakeLists.txt         | 2 --
- hooking/CMakeLists.txt | 3 ---
- 2 files changed, 5 deletions(-)
+ CMakeLists.txt | 2 --
+ 1 file changed, 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index deb9683..90fa14c 100644
+index 49b5ff1..46e2c60 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -32,8 +32,6 @@ set(GAMMARAY_VERSION_STRING "${GAMMARAY_VERSION}")
+@@ -36,8 +36,6 @@ set(GAMMARAY_VERSION_STRING "${GAMMARAY_VERSION}")
  set(GAMMARAY_SOVERSION "2.0.0")
- set(GAMMARAY_PLUGIN_VERSION "${GAMMARAY_VERSION_MAJOR}.${GAMMARAY_VERSION_MINOR}")
+ set(GAMMARAY_PLUGIN_VERSION "2.0")
  
 -set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 -
  enable_testing()
  
  if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
-diff --git a/hooking/CMakeLists.txt b/hooking/CMakeLists.txt
-index f3e08d4..846521a 100644
---- a/hooking/CMakeLists.txt
-+++ b/hooking/CMakeLists.txt
-@@ -1,6 +1,3 @@
--# Enable RPATH, make gammaray_probe find gammaray_core (same directory)
--set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
--
- include_directories(
-   ${CMAKE_SOURCE_DIR}
-   ${CMAKE_BINARY_DIR} # config-gammaray.h

-- 
gammaray packaging