[SCM] gammaray packaging branch, master, updated. debian/2.2.1-1-10-gd481bb2

[Felix Geyer]

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

The following commit has been merged in the master branch:
commit b4d56561a6c4b3521e8b308f3d751ba355025665
Author: Felix Geyer <fgeyer at debian.org>
Date:   Thu Aug 27 12:48:21 2015 +0200

    Explicitly disable VTK for the Qt4 build.
    
    It throws errors but isn't actually used.
---
 debian/changelog | 2 ++
 debian/rules     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d02c8fb..9a1fded 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ gammaray (2.3.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Refresh use-empty-rpath.patch.
   * Build-depend on the new libvtk6-qt-dev package. (Closes: #793604)
+  * Explicitly disable VTK for the Qt4 build. It throws errors but isn't
+    actually used.
 
  -- Felix Geyer <fgeyer at debian.org>  Thu, 27 Aug 2015 12:02:59 +0200
 
diff --git a/debian/rules b/debian/rules
index e716a9a..83c7a40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 override_dh_auto_configure:
 	dh_auto_configure -B obj-qt5
-	dh_auto_configure -B obj-qt4 -- -DGAMMARAY_ENFORCE_QT4_BUILD=ON -DGAMMARAY_PROBE_ONLY_BUILD=ON
+	dh_auto_configure -B obj-qt4 -- -DGAMMARAY_ENFORCE_QT4_BUILD=ON -DGAMMARAY_PROBE_ONLY_BUILD=ON -DCMAKE_DISABLE_FIND_PACKAGE_VTK=True
 
 override_dh_auto_build:
 	dh_auto_build -B obj-qt5 -O--parallel

-- 
gammaray packaging