[SCM] gammaray packaging branch, master, updated. debian/1.3.0-1-5-g34a5987

[Jakub Adam]

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

The following commit has been merged in the master branch:
commit 75eb9ee50639169de4cfdfef2a3fe03a6fc744f8
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed May 1 13:04:44 2013 +0200

    Refreshed patches
---
 debian/changelog                                   |    2 ++
 .../patches/gammaray-probe-versioned-soname.patch  |    8 ++++----
 .../patches/widget-export-actions-location.patch   |   10 +++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 234799d..988f7c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gammaray (1.3.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refreshed d/patches/widget-export-actions-location.patch and
+    d/patches/gammaray-probe-versioned-soname.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Wed, 01 May 2013 12:57:15 +0200
 
diff --git a/debian/patches/gammaray-probe-versioned-soname.patch b/debian/patches/gammaray-probe-versioned-soname.patch
index 0ad66ef..948aba6 100644
--- a/debian/patches/gammaray-probe-versioned-soname.patch
+++ b/debian/patches/gammaray-probe-versioned-soname.patch
@@ -10,11 +10,11 @@ Subject: gammaray-probe-versioned-soname
  4 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fe396a0..01dc3ac 100644
+index 0ce0cee..b3b6684 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -28,6 +28,7 @@ set(GAMMARAY_VERSION_MINOR "3")
- set(GAMMARAY_VERSION_PATCH "0")
+ set(GAMMARAY_VERSION_PATCH "1")
  set(GAMMARAY_VERSION "${GAMMARAY_VERSION_MAJOR}.${GAMMARAY_VERSION_MINOR}.${GAMMARAY_VERSION_PATCH}")
  set(GAMMARAY_VERSION_STRING "${GAMMARAY_VERSION}")
 +set(GAMMARAY_PROBE_SOVERSION "${GAMMARAY_VERSION_STRING}")
@@ -33,10 +33,10 @@ index 11c8cc3..b79c05d 100644
  #define GAMMARAY_BUILD_DIR "${CMAKE_BINARY_DIR}"
  
 diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index b0d6cf2..4978a5b 100644
+index 3831d1a..5f4ec80 100644
 --- a/core/CMakeLists.txt
 +++ b/core/CMakeLists.txt
-@@ -193,6 +193,6 @@ endif()
+@@ -194,6 +194,6 @@ endif()
  if(NOT WIN32)
    target_link_libraries(gammaray_probe dl)
  endif()
diff --git a/debian/patches/widget-export-actions-location.patch b/debian/patches/widget-export-actions-location.patch
index 53f439c..883fca7 100644
--- a/debian/patches/widget-export-actions-location.patch
+++ b/debian/patches/widget-export-actions-location.patch
@@ -15,10 +15,10 @@ postinst-must-call-ldconfig
  3 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4254e18..e448b56 100644
+index af187d6..52db6dd 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -126,6 +126,7 @@ if(Qt5Core_FOUND)
+@@ -132,6 +132,7 @@ if(Qt5Core_FOUND)
  else()
    set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt4/plugins")
  endif()
@@ -27,11 +27,11 @@ index 4254e18..e448b56 100644
  set(
    INSTALL_TARGETS_DEFAULT_ARGS
 diff --git a/core/tools/widgetinspector/CMakeLists.txt b/core/tools/widgetinspector/CMakeLists.txt
-index 94d8798..0a22d8b 100644
+index 2dfdf22..8effc9a 100644
 --- a/core/tools/widgetinspector/CMakeLists.txt
 +++ b/core/tools/widgetinspector/CMakeLists.txt
-@@ -12,4 +12,4 @@ target_link_libraries(gammaray_widget_export_actions
-   ${QT_QTDESIGNER_LIBRARIES}
+@@ -18,4 +18,4 @@ target_link_libraries(gammaray_widget_export_actions
+   ${EXTRA_LIBS}
  )
  
 -install(TARGETS gammaray_widget_export_actions ${INSTALL_TARGETS_DEFAULT_ARGS})

-- 
gammaray packaging