[SCM] gammaray packaging branch, master, updated. debian/1.3.0-1-30-g8272acb
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Sat Jan 18 23:09:16 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=dce424b
The following commit has been merged in the master branch:
commit dce424b39f7526d78cd571774525c0ecb3bde442
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Wed Dec 25 20:48:39 2013 +0100
Enable build of Qt5 GUI and Qt5 + Qt4 probe libraries
---
debian/changelog | 1 +
debian/control | 29 ++++++++++++++++++++++++-
debian/gammaray-dev.install | 2 +-
debian/gammaray-plugin-kjobtracker.install | 2 +-
debian/gammaray-plugin-objectvisualizer.install | 2 +-
debian/gammaray-probe-qt4.install | 27 +++++++++++++++++++++++
debian/gammaray-probe-qt5.install | 25 +++++++++++++++++++++
debian/gammaray.install | 20 ++++-------------
debian/patches/find-qt5-webkit-5.1.patch | 21 ++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 12 +++++++---
11 files changed, 119 insertions(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4a544f5..c1f6367 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ gammaray (1.9.95-1) UNRELEASED; urgency=low
- gammaray-probe-versioned-soname.patch.
* Use xz for orig tarball compression.
* Bump Standards-Version to 3.9.5.
+ * Enable build of Qt5 GUI and Qt5 + Qt4 probe libraries.
-- Jakub Adam <jakub.adam at ktknet.cz> Sat, 21 Dec 2013 09:25:42 +0100
diff --git a/debian/control b/debian/control
index 325c341..876c444 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,11 @@ Uploaders: Jakub Adam <jakub.adam at ktknet.cz>
Build-Depends: debhelper (>= 9),
cmake,
kdelibs5-dev,
+ qtbase5-private-dev,
+ qtscript5-dev,
+ qttools5-dev,
+ libqt5svg5-dev,
+ libqt5webkit5-dev,
libqt4-dev,
libqt4-private-dev,
libqtwebkit-dev,
@@ -24,7 +29,8 @@ Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
-Recommends: gdb
+Recommends: gammaray-probe-qt4 | gammaray-probe-qt5,
+ gdb
Description: Tool for examining the internals of Qt application
GammaRay is a tool for examining the internals of a Qt application and
to some extent also manipulate it. GammaRay uses injection methods to
@@ -33,6 +39,27 @@ Description: Tool for examining the internals of Qt application
the complex internal structures you find in some Qt frameworks, such as
QGraphicsView, model/view, QTextDocument, state machines and more.
+Package: gammaray-probe-qt5
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: gammaray (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: TODO
+
+Package: gammaray-probe-qt4
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: gammaray (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: GammaRay support for inspecting Qt4 applications
+ This package contains GammaRay probe libraries that have to be loaded
+ into the application being inspected in order to allow GammaRay to
+ examine its internals. The gammaray package already includes the probe
+ binaries compiled for Qt5. Install this package if you want to use
+ GammaRay with Qt4 applications.
+
Package: gammaray-plugin-objectvisualizer
Architecture: any
Depends: gammaray (= ${binary:Version}),
diff --git a/debian/gammaray-dev.install b/debian/gammaray-dev.install
index bae5fe8..ff46386 100644
--- a/debian/gammaray-dev.install
+++ b/debian/gammaray-dev.install
@@ -1,2 +1,2 @@
usr/include
-usr/lib/libgammaray*qt4*.so
+usr/lib/libgammaray*.so
diff --git a/debian/gammaray-plugin-kjobtracker.install b/debian/gammaray-plugin-kjobtracker.install
index 1215ca1..22119c6 100644
--- a/debian/gammaray-plugin-kjobtracker.install
+++ b/debian/gammaray-plugin-kjobtracker.install
@@ -1 +1 @@
-usr/lib/gammaray/*/qt4*/gammaray_kjobtracker*
+usr/lib/gammaray/*/qt*/gammaray_kjobtracker*
diff --git a/debian/gammaray-plugin-objectvisualizer.install b/debian/gammaray-plugin-objectvisualizer.install
index fdfa2d9..4b4284e 100644
--- a/debian/gammaray-plugin-objectvisualizer.install
+++ b/debian/gammaray-plugin-objectvisualizer.install
@@ -1 +1 @@
-usr/lib/gammaray/*/qt4*/gammaray_objectvisualizer*
+usr/lib/gammaray/*/qt*/gammaray_objectvisualizer*
diff --git a/debian/gammaray-probe-qt4.install b/debian/gammaray-probe-qt4.install
new file mode 100644
index 0000000..f60244c
--- /dev/null
+++ b/debian/gammaray-probe-qt4.install
@@ -0,0 +1,27 @@
+usr/lib/libgammaray*qt4*.so.*
+usr/lib/gammaray/*/qt4*/gammaray_actioninspector.desktop
+usr/lib/gammaray/*/qt4*/gammaray_actioninspector_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_codecbrowser.desktop
+usr/lib/gammaray/*/qt4*/gammaray_codecbrowser_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_fontbrowser.desktop
+usr/lib/gammaray/*/qt4*/gammaray_fontbrowser_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_inprocessui.so
+usr/lib/gammaray/*/qt4*/gammaray_probe.so
+usr/lib/gammaray/*/qt4*/gammaray_sceneinspector.desktop
+usr/lib/gammaray/*/qt4*/gammaray_sceneinspector_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_scriptenginedebugger.desktop
+usr/lib/gammaray/*/qt4*/gammaray_scriptenginedebugger_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_selectionmodelinspector.desktop
+usr/lib/gammaray/*/qt4*/gammaray_selectionmodelinspector_plugin.so
+usr/lib/gammaray/*/qt4*/gammaray_statemachineviewer.desktop
+usr/lib/gammaray/*/qt4*/gammaray_statemachineviewer_plugin.so
+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/gammaray-probe-qt5.install b/debian/gammaray-probe-qt5.install
new file mode 100644
index 0000000..7c9168d
--- /dev/null
+++ b/debian/gammaray-probe-qt5.install
@@ -0,0 +1,25 @@
+usr/lib/libgammaray*qt5*.so.*
+usr/lib/gammaray/*/qt5*/gammaray_actioninspector.desktop
+usr/lib/gammaray/*/qt5*/gammaray_actioninspector_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_codecbrowser.desktop
+usr/lib/gammaray/*/qt5*/gammaray_codecbrowser_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_fontbrowser.desktop
+usr/lib/gammaray/*/qt5*/gammaray_fontbrowser_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_inprocessui.so
+usr/lib/gammaray/*/qt5*/gammaray_probe.so
+usr/lib/gammaray/*/qt5*/gammaray_sceneinspector.desktop
+usr/lib/gammaray/*/qt5*/gammaray_sceneinspector_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_scriptenginedebugger.desktop
+usr/lib/gammaray/*/qt5*/gammaray_scriptenginedebugger_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_selectionmodelinspector.desktop
+usr/lib/gammaray/*/qt5*/gammaray_selectionmodelinspector_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_statemachineviewer.desktop
+usr/lib/gammaray/*/qt5*/gammaray_statemachineviewer_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_styleinspector.desktop
+usr/lib/gammaray/*/qt5*/gammaray_styleinspector_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_timertop.desktop
+usr/lib/gammaray/*/qt5*/gammaray_timertop_plugin.so
+usr/lib/gammaray/*/qt5*/gammaray_widgetinspector.desktop
+usr/lib/gammaray/*/qt5*/gammaray_widgetinspector_plugin.so
+usr/lib/gammaray/*/qt5*/libgammaray_widget_export_actions.so
+
diff --git a/debian/gammaray.install b/debian/gammaray.install
index c5827f1..06e1e90 100644
--- a/debian/gammaray.install
+++ b/debian/gammaray.install
@@ -1,19 +1,7 @@
usr/bin
-usr/lib/libgammaray*qt4*.so.*
usr/lib/gammaray/libexec
-usr/lib/gammaray/*/qt4*/gammaray_actioninspector*
-usr/lib/gammaray/*/qt4*/gammaray_codecbrowser*
-usr/lib/gammaray/*/qt4*/gammaray_fontbrowser*
-usr/lib/gammaray/*/qt4*/gammaray_inprocessui*
-usr/lib/gammaray/*/qt4*/gammaray_probe*
-usr/lib/gammaray/*/qt4*/gammaray_sceneinspector*
-usr/lib/gammaray/*/qt4*/gammaray_scriptenginedebugger*
-usr/lib/gammaray/*/qt4*/gammaray_selectionmodelinspector*
-usr/lib/gammaray/*/qt4*/gammaray_statemachineviewer*
-usr/lib/gammaray/*/qt4*/gammaray_styleinspector*
-usr/lib/gammaray/*/qt4*/gammaray_timertop*
-usr/lib/gammaray/*/qt4*/gammaray_webinspector*
-usr/lib/gammaray/*/qt4*/gammaray_widgetinspector*
-usr/lib/gammaray/*/qt4*/libgammaray_widget_export_actions*
-usr/lib/qt4/plugins/*
+usr/lib/gammaray/*/qt5*/*_ui.desktop
+usr/lib/gammaray/*/qt5*/*_ui_plugin.so
+usr/lib/qt5/plugins/*
usr/share
+
diff --git a/debian/patches/find-qt5-webkit-5.1.patch b/debian/patches/find-qt5-webkit-5.1.patch
new file mode 100644
index 0000000..05c15b8
--- /dev/null
+++ b/debian/patches/find-qt5-webkit-5.1.patch
@@ -0,0 +1,21 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Thu, 26 Dec 2013 10:14:12 +0100
+Subject: find-qt5-webkit-5.1
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90fa14c..7d808cc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -92,7 +92,7 @@ if(Qt5Core_FOUND)
+ find_package(Qt5Script QUIET)
+ find_package(Qt5ScriptTools QUIET)
+ find_package(Qt5Location QUIET) # workaround for 5.1 webkit that tries to find a qtlocation with a matching version if none (with any version) has been found before...
+- find_package(Qt5WebKitWidgets 5.0.2 QUIET) # 5.0.[01] has a code generation bug in uic that fails to generate proper code for webkitwidget classes
++ find_package(Qt5WebKitWidgets QUIET)
+ find_package(Qt5Designer QUIET)
+
+ include("cmake/ECMQt4To5Porting.cmake")
diff --git a/debian/patches/series b/debian/patches/series
index 7075544..73cb43e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
use-empty-rpath.patch
+find-qt5-webkit-5.1.patch
diff --git a/debian/rules b/debian/rules
index f09ea19..10ea906 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-.PHONY: override_dh_auto_configure override_dh_auto_test override_dh_auto_install override_dh_installdocs override_dh_strip override_dh_clean
+.PHONY: override_dh_auto_configure override_dh_auto_build override_dh_auto_test override_dh_auto_install override_dh_installdocs override_dh_strip override_dh_clean
%:
dh $@ --parallel
@@ -11,13 +11,19 @@ override_dh_auto_configure:
mv 3rdparty/qt/private 3rdparty/qt/private.dont.use; \
fi
- 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
+
+override_dh_auto_build:
+ dh_auto_build -B obj-qt5 -O--parallel
+ dh_auto_build -B obj-qt4 -O--parallel
override_dh_auto_test:
xvfb-run dh_auto_test
override_dh_auto_install:
- dh_auto_install
+ dh_auto_install -B obj-qt5
+ dh_auto_install -B obj-qt4
rm -f debian/tmp/usr/share/doc/gammaray/License.txt
override_dh_installdocs:
--
gammaray packaging
More information about the pkg-kde-commits
mailing list