[SCM] gammaray packaging branch, master, updated. debian/1.2.2-1-15-g6fbd840

[Jakub Adam]

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

The following commit has been merged in the master branch:
commit c94057590cc20ee23aba70fe5387f3f727a109bb
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Jan 28 18:38:16 2013 +0100

    Refreshed patches
---
 debian/changelog                                   |    2 ++
 .../patches/gammaray-probe-versioned-soname.patch  |   14 +++++++-------
 .../patches/widget-export-actions-location.patch   |   18 +++++++++---------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78b940e..4757a6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ gammaray (1.3.0-1) UNRELEASED; urgency=low
   * Add dependency on VTK 5.10 and enable object visualizer plugin.
   * Don't set RPATH in binaries; prevents binary-or-shlib-defines-rpath
     lintian error.
+  * Refreshed d/patches/widget-export-actions-location.patch and
+    d/patches/gammaray-probe-versioned-soname.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 28 Jan 2013 18:29:54 +0100
 
diff --git a/debian/patches/gammaray-probe-versioned-soname.patch b/debian/patches/gammaray-probe-versioned-soname.patch
index bec30b2..0ad66ef 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 f2055bb..4bbee30 100644
+index fe396a0..01dc3ac 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -28,6 +28,7 @@ set(GAMMARAY_VERSION_MINOR "2")
- set(GAMMARAY_VERSION_PATCH "2")
+@@ -28,6 +28,7 @@ set(GAMMARAY_VERSION_MINOR "3")
+ set(GAMMARAY_VERSION_PATCH "0")
  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}")
@@ -22,7 +22,7 @@ index f2055bb..4bbee30 100644
  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
  
 diff --git a/config-gammaray.h.cmake b/config-gammaray.h.cmake
-index 0236a7c..2bda83c 100644
+index 11c8cc3..b79c05d 100644
 --- a/config-gammaray.h.cmake
 +++ b/config-gammaray.h.cmake
 @@ -1,5 +1,6 @@
@@ -33,10 +33,10 @@ index 0236a7c..2bda83c 100644
  #define GAMMARAY_BUILD_DIR "${CMAKE_BINARY_DIR}"
  
 diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index b49d795..10d81e3 100644
+index b0d6cf2..4978a5b 100644
 --- a/core/CMakeLists.txt
 +++ b/core/CMakeLists.txt
-@@ -172,6 +172,6 @@ target_link_libraries(gammaray_probe
+@@ -193,6 +193,6 @@ endif()
  if(NOT WIN32)
    target_link_libraries(gammaray_probe dl)
  endif()
@@ -45,7 +45,7 @@ index b49d795..10d81e3 100644
  
  install(TARGETS gammaray_probe ${INSTALL_TARGETS_DEFAULT_ARGS})
 diff --git a/launcher/probefinder.cpp b/launcher/probefinder.cpp
-index 6ab643b..d011a60 100644
+index 7590e47..a6a8b44 100644
 --- a/launcher/probefinder.cpp
 +++ b/launcher/probefinder.cpp
 @@ -50,7 +50,7 @@ QString findProbe(const QString &baseName)
diff --git a/debian/patches/widget-export-actions-location.patch b/debian/patches/widget-export-actions-location.patch
index 5508966..53f439c 100644
--- a/debian/patches/widget-export-actions-location.patch
+++ b/debian/patches/widget-export-actions-location.patch
@@ -15,32 +15,32 @@ postinst-must-call-ldconfig
  3 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 74548df..971ecbf 100644
+index 4254e18..e448b56 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -87,6 +87,7 @@ endif()
- set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
- set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
- set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt4/plugins")
+@@ -126,6 +126,7 @@ if(Qt5Core_FOUND)
+ else()
+   set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt4/plugins")
+ endif()
 +set(MODULE_INSTALL_DIR "${LIB_INSTALL_DIR}/gammaray")
  
  set(
    INSTALL_TARGETS_DEFAULT_ARGS
 diff --git a/core/tools/widgetinspector/CMakeLists.txt b/core/tools/widgetinspector/CMakeLists.txt
-index eefa624..e851f8d 100644
+index 94d8798..0a22d8b 100644
 --- a/core/tools/widgetinspector/CMakeLists.txt
 +++ b/core/tools/widgetinspector/CMakeLists.txt
-@@ -10,4 +10,4 @@ target_link_libraries(gammaray_widget_export_actions
+@@ -12,4 +12,4 @@ target_link_libraries(gammaray_widget_export_actions
    ${QT_QTDESIGNER_LIBRARIES}
  )
  
 -install(TARGETS gammaray_widget_export_actions ${INSTALL_TARGETS_DEFAULT_ARGS})
 +install(TARGETS gammaray_widget_export_actions DESTINATION ${MODULE_INSTALL_DIR})
 diff --git a/core/tools/widgetinspector/widgetinspector.cpp b/core/tools/widgetinspector/widgetinspector.cpp
-index dcd9e1a..1fafc92 100644
+index 6d9bded..9af5048 100644
 --- a/core/tools/widgetinspector/widgetinspector.cpp
 +++ b/core/tools/widgetinspector/widgetinspector.cpp
-@@ -246,7 +246,7 @@ void WidgetInspector::callExternalExportAction(const char *name,
+@@ -279,7 +279,7 @@ void WidgetInspector::callExternalExportAction(const char *name,
  {
    if (!m_externalExportActions.isLoaded()) {
      const QString probePath =

-- 
gammaray packaging