[SCM] gammaray packaging branch, master, updated. debian/2.1.0-5-19-gb6c2128

[Jakub Adam]

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

The following commit has been merged in the master branch:
commit dade711efe86d8f28ccb3dbcbdc371eac1a61a77
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Jul 1 18:20:58 2015 +0200

    Disable build of Qt4 web inspector plugin
---
 debian/changelog                              |  2 ++
 debian/control                                |  1 -
 debian/gammaray-probe-qt4.install             |  2 --
 debian/patches/disable-qt4-webinspector.patch | 23 +++++++++++++++++++++++
 debian/patches/series                         |  1 +
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dab2bd6..9449d57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ gammaray (2.2.1-1) UNRELEASED; urgency=medium
     available.
   * Don't set RPATH in binaries; prevents binary-or-shlib-defines-rpath
     lintian error.
+  * Disable build of Qt4 web inspector plugin since qtwebkit is to be removed
+    from the repository (Closes: #784466).
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 07 Feb 2015 12:00:17 +0100
 
diff --git a/debian/control b/debian/control
index a9a950b..578edf3 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 9),
                libqt5webkit5-dev,
                qtdeclarative5-private-dev,
                libqt4-dev,
-               libqtwebkit-dev,
                libgraphviz-dev,
                libvtk6-dev,
                gdb,
diff --git a/debian/gammaray-probe-qt4.install b/debian/gammaray-probe-qt4.install
index ccc8bec..e9c9200 100644
--- a/debian/gammaray-probe-qt4.install
+++ b/debian/gammaray-probe-qt4.install
@@ -21,8 +21,6 @@ usr/lib/gammaray/*/qt4*/gammaray_styleinspector.desktop
 usr/lib/gammaray/*/qt4*/gammaray_styleinspector_plugin.so
 usr/lib/gammaray/*/qt4*/gammaray_timertop.desktop
 usr/lib/gammaray/*/qt4*/gammaray_timertop_plugin.so
-usr/lib/gammaray/*/qt4*/gammaray_webinspector.desktop
-usr/lib/gammaray/*/qt4*/gammaray_webinspector_plugin.so
 usr/lib/gammaray/*/qt4*/gammaray_widgetinspector.desktop
 usr/lib/gammaray/*/qt4*/gammaray_widgetinspector_plugin.so
 usr/lib/gammaray/*/qt4*/libgammaray_widget_export_actions.so
diff --git a/debian/patches/disable-qt4-webinspector.patch b/debian/patches/disable-qt4-webinspector.patch
new file mode 100644
index 0000000..ed48c92
--- /dev/null
+++ b/debian/patches/disable-qt4-webinspector.patch
@@ -0,0 +1,23 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Wed, 1 Jul 2015 19:55:52 +0200
+Subject: disable-qt4-webinspector
+
+---
+ plugins/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
+index dd72f79..90b4df5 100644
+--- a/plugins/CMakeLists.txt
++++ b/plugins/CMakeLists.txt
+@@ -9,7 +9,9 @@ add_subdirectory(selectionmodelinspector)
+ add_subdirectory(signalmonitor)
+ add_subdirectory(statemachineviewer)
+ add_subdirectory(timertop)
+-add_subdirectory(webinspector)
++if (Qt5Core_FOUND)
++  add_subdirectory(webinspector)
++endif()
+ 
+ if(Qt5Core_FOUND)
+   add_subdirectory(translatorinspector)
diff --git a/debian/patches/series b/debian/patches/series
index f529ca3..d2e8ae3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ debian-archs-fix-build.patch
 fix-objectvisualizer-build.patch
 use-empty-rpath.patch
 disable-qt4-objectvisualizer.patch
+disable-qt4-webinspector.patch

-- 
gammaray packaging