[SCM] gammaray packaging branch, experimental, updated. debian/2.1.0-3-23-g7ad1927

[Jakub Adam]

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

The following commit has been merged in the experimental branch:
commit 5954156c31c5639031477fdd07c27a131377b6ed
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Feb 7 14:17:36 2015 +0100

    Refresh d/patches/fix-objectvisualizer-build.patch
---
 debian/changelog                                | 2 +-
 debian/patches/fix-objectvisualizer-build.patch | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa6dfff..dab2bd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 gammaray (2.2.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
-  * Refresh d/patches/debian-archs-fix-build.patch.
+  * Refresh debian-archs-fix-build.patch and fix-objectvisualizer-build.patch.
   * Install new signalmonitor and translatorinspector plugins.
   * Update d/changelog with (re)moved files.
   * Re-enable objectvisualizer plugin since Qt5-compatible VTK has become
diff --git a/debian/patches/fix-objectvisualizer-build.patch b/debian/patches/fix-objectvisualizer-build.patch
index c396c5a..4d8af19 100644
--- a/debian/patches/fix-objectvisualizer-build.patch
+++ b/debian/patches/fix-objectvisualizer-build.patch
@@ -7,7 +7,7 @@ Subject: fix-objectvisualizer-build
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/plugins/objectvisualizer/CMakeLists.txt b/plugins/objectvisualizer/CMakeLists.txt
-index 94bef6d..e30506e 100644
+index 56c19c9..99c30ec 100644
 --- a/plugins/objectvisualizer/CMakeLists.txt
 +++ b/plugins/objectvisualizer/CMakeLists.txt
 @@ -15,8 +15,7 @@ target_link_libraries(gammaray_objectvisualizer_plugin
@@ -15,8 +15,8 @@ index 94bef6d..e30506e 100644
  
  ######## START VTK VISUALIZATION
 -# VTK includes QtGui/... stuff => breaks compilation with Qt5
--if(VTK_FOUND AND NOT Qt5Core_FOUND AND NOT GAMMARAY_PROBE_ONLY_BUILD)
-+if(VTK_FOUND AND NOT GAMMARAY_PROBE_ONLY_BUILD)
+-if(VTK_FOUND AND NOT Qt5Core_FOUND AND GAMMARAY_BUILD_UI)
++if(VTK_FOUND AND GAMMARAY_BUILD_UI)
  
  set(OPTIONAL_VTK_LIBRARIES
  )

-- 
gammaray packaging