[neon/extras/gammaray/Neon/release_jammy] debian: kf6ify
Carlos De Maine
null at kde.org
Wed Oct 2 01:08:44 BST 2024
Git commit 14ce58185b6bf886bcbc4e1113c97314d6fae9ac by Carlos De Maine.
Committed on 02/10/2024 at 00:07.
Pushed by carlosdem into branch 'Neon/release_jammy'.
kf6ify
M +6 -0 debian/changelog
M +49 -36 debian/control
M +5 -5 debian/gammaray-dev.install
M +1 -1 debian/gammaray-plugin-positioning.install
M +3 -3 debian/gammaray-plugin-quickinspector.install
M +33 -35 debian/gammaray.install
M +2 -2 debian/patches/series
M +16 -12 debian/rules
M +5 -2 debian/watch
https://invent.kde.org/neon/extras/gammaray/-/commit/14ce58185b6bf886bcbc4e1113c97314d6fae9ac
diff --git a/debian/changelog b/debian/changelog
index a73d50d5..6eb9ab90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gammaray (3.1.0-0neon) noble; urgency=medium
+
+ * New release
+
+ -- Harald Sitter <sitter at kde.org> Fri, 25 Sep 2020 13:52:10 +0200
+
gammaray (2.11.3-0neon) focal; urgency=medium
* New release
diff --git a/debian/control b/debian/control
index 0b18d360..b004102e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,37 +4,50 @@ Section: devel
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Jakub Adam <jakub.adam at ktknet.cz>
Build-Depends: cmake,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
+ doxygen,
gdb,
+ graphviz,
+ libbfd-dev,
+ libdw-dev,
+ libdwarf-dev,
+ libelf-dev,
libgraphviz-dev,
- libkf5coreaddons-dev,
- libkf5syntaxhighlighting-dev,
+ libiberty-dev,
libproj-dev,
- libqt5svg5-dev,
- libqt5waylandcompositor5-dev,
- libwayland-dev (>= 1.12.0),
- qml-module-qtquick2,
- qt3d-assimpsceneimport-plugin,
- qt3d-defaultgeometryloader-plugin,
- qt3d-gltfsceneio-plugin,
- qt3d-scene2d-plugin,
- qt3d5-dev,
- qtbase5-private-dev,
- qtconnectivity5-dev,
- qtdeclarative5-dev,
- qtdeclarative5-dev-tools,
- qtdeclarative5-private-dev,
- qtlocation5-dev,
- qtpositioning5-dev,
- qtscript5-dev,
- qttools5-dev,
- qttools5-dev-tools,
- qttranslations5-l10n,
- qtwayland5,
- qtwebengine5-dev [amd64 arm64 armhf i386 mipsel],
+ libwayland-dev,
+ kf6-extra-cmake-modules,
+ kf6-kcoreaddons-dev,
+ kf6-syntax-highlighting-dev,
+ pkg-kde-tools-neon,
+ ninja-build,
+ qml6-module-qtquick,
+ qtchooser,
+ qt6-3d-assimpsceneimport-plugin,
+ qt6-3d-defaultgeometryloader-plugin,
+ qt6-3d-gltfsceneio-plugin,
+ qt6-3d-scene2d-plugin,
+ qt6-3d-dev,
+ qt6-base-dev,
+ qt6-base-private-dev,
+ qt6-connectivity-dev,
+ qt6-declarative-dev,
+ qt6-declarative-dev-tools,
+ qt6-declarative-private-dev,
+ qt6-doc-dev,
+ qt6-location-dev,
+ qt6-positioning-dev,
+ qt6-scxml-dev,
+ qt6-shadertools-dev,
+ qt6-svg-dev,
+ qt6-tools-dev,
+ qt6-tools-dev-tools,
+ qt6-translations-l10n,
+ qt6-wayland-dev,
+ qt6-webengine-dev [amd64 arm64 armhf i386 mipsel],
xauth,
xvfb
-Standards-Version: 4.4.0
+Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/gammaray.git
Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/gammaray
Homepage: https://www.kdab.com/development-resources/qt-tools/gammaray/
@@ -42,9 +55,9 @@ Homepage: https://www.kdab.com/development-resources/qt-tools/gammaray/
Package: gammaray
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
-Depends: qml-module-qt3d,
- qml-module-qtquick-controls,
- qml-module-qtquick-scene3d,
+Depends: qml6-module-qt3d-extras,
+ qml6-module-qtquick-controls,
+ qml6-module-qtquick-scene3d,
${misc:Depends},
${shlibs:Depends}
Recommends: gdb
@@ -59,8 +72,8 @@ Description: Tool for examining the internals of Qt application
Package: gammaray-plugin-quickinspector
Architecture: any
Depends: gammaray (= ${binary:Version}),
- qml-module-qtquick-controls,
- qml-module-qtquick2,
+ qml6-module-qtquick-controls,
+ qml6-module-qtquick,
${misc:Depends},
${shlibs:Depends}
Enhances: gammaray
@@ -103,14 +116,14 @@ Description: QtBluetooth type support for GammaRay
Package: gammaray-plugin-positioning
Architecture: any
Depends: gammaray (= ${binary:Version}),
- qml-module-qtlocation,
- qml-module-qtpositioning,
- qml-module-qtquick2,
+ qml6-module-qtlocation,
+ qml6-module-qtpositioning,
+ qml6-module-qtquick,
${misc:Depends},
${shlibs:Depends}
Enhances: gammaray
-Description: Qt5Positioning type support for GammaRay
- This plugin adds support for Qt5Positioning types into GammaRay.
+Description: Qt6Positioning type support for GammaRay
+ This plugin adds support for Qt6Positioning types into GammaRay.
Package: gammaray-dev
Architecture: any
diff --git a/debian/gammaray-dev.install b/debian/gammaray-dev.install
index 99211268..953f2483 100644
--- a/debian/gammaray-dev.install
+++ b/debian/gammaray-dev.install
@@ -1,11 +1,11 @@
usr/include
usr/lib/*/cmake/
usr/lib/*/libgammaray_client.so
-usr/lib/*/libgammaray_common-qt5*.so
-usr/lib/*/libgammaray_core-qt*.so
-usr/lib/*/libgammaray_kitemmodels-qt5*.so
+usr/lib/*/libgammaray_common-qt6*.so
+usr/lib/*/libgammaray_core-qt6*.so
+usr/lib/*/libgammaray_kitemmodels-qt6*.so
usr/lib/*/libgammaray_kuserfeedback.so
usr/lib/*/libgammaray_launcher.so
usr/lib/*/libgammaray_launcher_ui.so
-usr/lib/*/libgammaray_ui-qt5*.so
-usr/lib/*/qt5/mkspecs/modules/
+usr/lib/*/libgammaray_ui-qt6*.so
+usr/lib/*/qt6/mkspecs/modules/
diff --git a/debian/gammaray-plugin-positioning.install b/debian/gammaray-plugin-positioning.install
index 36bee3f1..dee0356e 100644
--- a/debian/gammaray-plugin-positioning.install
+++ b/debian/gammaray-plugin-positioning.install
@@ -1,2 +1,2 @@
usr/lib/*/gammaray/*/qt*/gammaray_positioning*
-usr/lib/*/gammaray/*/qt5*/target/position/libgammaray_geopositioninfosource.so
+usr/lib/*/gammaray/*/qt*/target/position/libgammaray_geopositioninfosource.so
diff --git a/debian/gammaray-plugin-quickinspector.install b/debian/gammaray-plugin-quickinspector.install
index 1efda246..7e9fd4c8 100644
--- a/debian/gammaray-plugin-quickinspector.install
+++ b/debian/gammaray-plugin-quickinspector.install
@@ -1,3 +1,3 @@
-usr/lib/*/gammaray/*/qt5*/gammaray_qmlsupport.so
-usr/lib/*/gammaray/*/qt5*/gammaray_quickinspector*
-usr/lib/*/gammaray/*/qt5*/gammaray_quickwidgetsupport*
+usr/lib/*/gammaray/*/qt*/gammaray_qmlsupport.so
+usr/lib/*/gammaray/*/qt*/gammaray_quickinspector*
+usr/lib/*/gammaray/*/qt*/gammaray_quickwidgetsupport*
diff --git a/debian/gammaray.install b/debian/gammaray.install
index fbb7cf65..6f8693ec 100644
--- a/debian/gammaray.install
+++ b/debian/gammaray.install
@@ -1,41 +1,39 @@
usr/bin
-usr/lib/*/gammaray/*/qt5*/gammaray_3dinspector.so
-usr/lib/*/gammaray/*/qt5*/gammaray_3dinspector_ui.so
-usr/lib/*/gammaray/*/qt5*/gammaray_actioninspector*
-usr/lib/*/gammaray/*/qt5*/gammaray_codecbrowser*
-usr/lib/*/gammaray/*/qt5*/gammaray_eventmonitor_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_eventmonitor_ui_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_fontbrowser*
-usr/lib/*/gammaray/*/qt5*/gammaray_guisupport*
-usr/lib/*/gammaray/*/qt5*/gammaray_inprocessui.so
-usr/lib/*/gammaray/*/qt5*/gammaray_localeinspector_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_localeinspector_ui_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_mimetypes.so
-usr/lib/*/gammaray/*/qt5*/gammaray_mimetypes_ui.so
-usr/lib/*/gammaray/*/qt5*/gammaray_modelinspector*
-usr/lib/*/gammaray/*/qt5*/gammaray_network*
-usr/lib/*/gammaray/*/qt5*/gammaray_objectvisualizer_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_probe.so
-usr/lib/*/gammaray/*/qt5*/gammaray_qmlsupport_ui.so
-usr/lib/*/gammaray/*/qt5*/gammaray_qtivi_ui.so
-usr/lib/*/gammaray/*/qt5*/gammaray_sceneinspector*
-usr/lib/*/gammaray/*/qt5*/gammaray_scriptenginedebugger*
-usr/lib/*/gammaray/*/qt5*/gammaray_signalmonitor*
-usr/lib/*/gammaray/*/qt5*/gammaray_statemachineviewer*
-usr/lib/*/gammaray/*/qt5*/gammaray_styleinspector*
-usr/lib/*/gammaray/*/qt5*/gammaray_sysinfo_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_sysinfo_ui_plugin.so
-usr/lib/*/gammaray/*/qt5*/gammaray_textdocumentinspector*
-usr/lib/*/gammaray/*/qt5*/gammaray_timertop*
-usr/lib/*/gammaray/*/qt5*/gammaray_translatorinspector*
-usr/lib/*/gammaray/*/qt5*/gammaray_webinspector*
-usr/lib/*/gammaray/*/qt5*/gammaray_widgetinspector*
-usr/lib/*/gammaray/*/qt5*/libgammaray_widget_export_actions.so
-usr/lib/*/gammaray/*/qt5*/styles/*
+usr/lib/*/gammaray/*/qt*/gammaray_3dinspector.so
+usr/lib/*/gammaray/*/qt*/gammaray_3dinspector_ui.so
+usr/lib/*/gammaray/*/qt*/gammaray_actioninspector*
+usr/lib/*/gammaray/*/qt*/gammaray_eventmonitor_plugin.so
+usr/lib/*/gammaray/*/qt*/gammaray_eventmonitor_ui_plugin.so
+usr/lib/*/gammaray/*/qt*/gammaray_fontbrowser*
+usr/lib/*/gammaray/*/qt*/gammaray_guisupport*
+usr/lib/*/gammaray/*/qt*/gammaray_inprocessui.so
+usr/lib/*/gammaray/*/qt*/gammaray_localeinspector_plugin.so
+usr/lib/*/gammaray/*/qt*/gammaray_localeinspector_ui_plugin.so
+usr/lib/*/gammaray/*/qt*/gammaray_mimetypes.so
+usr/lib/*/gammaray/*/qt*/gammaray_mimetypes_ui.so
+usr/lib/*/gammaray/*/qt*/gammaray_modelinspector*
+usr/lib/*/gammaray/*/qt*/gammaray_network*
+usr/lib/*/gammaray/*/qt*/gammaray_openglsupport.so
+usr/lib/*/gammaray/*/qt*/gammaray_probe.so
+usr/lib/*/gammaray/*/qt*/gammaray_qmlsupport_ui.so
+#usr/lib/*/gammaray/*/qt*/gammaray_qtivi_ui.so
+usr/lib/*/gammaray/*/qt*/gammaray_sceneinspector*
+usr/lib/*/gammaray/*/qt*/gammaray_signalmonitor*
+usr/lib/*/gammaray/*/qt*/gammaray_statemachineviewer_plugin.so
+usr/lib/*/gammaray/*/qt*/gammaray_styleinspector*
+usr/lib/*/gammaray/*/qt*/gammaray_sysinfo_plugin.so
+usr/lib/*/gammaray/*/qt*/gammaray_sysinfo_ui_plugin.so
+usr/lib/*/gammaray/*/qt*/gammaray_textdocumentinspector*
+usr/lib/*/gammaray/*/qt*/gammaray_timertop*
+usr/lib/*/gammaray/*/qt*/gammaray_translatorinspector*
+usr/lib/*/gammaray/*/qt*/gammaray_webinspector*
+usr/lib/*/gammaray/*/qt*/gammaray_widgetinspector*
+usr/lib/*/gammaray/*/qt*/libgammaray_widget_export_actions.so
+usr/lib/*/gammaray/*/qt*/styles/*
usr/lib/*/gammaray/libexec
-usr/lib/*/libgammaray*qt5*.so.*
+usr/lib/*/libgammaray*qt*.so.*
usr/lib/*/libgammaray_client.so.*
usr/lib/*/libgammaray_kuserfeedback.so.*
usr/lib/*/libgammaray_launcher.so.*
usr/lib/*/libgammaray_launcher_ui.so.*
-usr/share
+usr/share/
diff --git a/debian/patches/series b/debian/patches/series
index b6020e76..5e9c9787 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-debian-archs-fix-build.patch
-qt-system-paths.patch
+#debian-archs-fix-build.patch
+#qt-system-paths.patch
diff --git a/debian/rules b/debian/rules
index ab11c31d..36f67b7f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-export QT_SELECT=5
+export QT_SELECT=6
# Give the build more time to finish the test suite.
# Timeouts have been appearing on buildd machines for some architectures.
@@ -13,20 +13,20 @@ export GAMMARAY_LAUNCHER_TIMEOUT=240
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
%:
- dh $@
+ dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
override_dh_auto_configure:
- dh_auto_configure -- -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE
-
+ dh_auto_configure -- \
+ --log-level=STATUS \
+ -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE \
+ -DQT_VERSION_MAJOR=6 \
+ -DECM_MKSPECS_INSTALL_DIR=/usr/lib/*/qt6/mkspecs/modules \
+ -DPLUGIN_INSTALL_DIR=/usr/lib/*/qt6/plugins/gammaray \
+ -DGAMMARAY_BUILD_DOCS=FALSE
+
override_dh_auto_test:
-ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 i386 ppc64el))
- xvfb-run -a -s "-screen 0 640x480x24" dh_auto_test --max-parallel=1 -- ARGS="-V"
-# attachtest-gdb is unstable on s390x and hangs builds
-else ifeq ($(DEB_HOST_ARCH), s390x)
- -xvfb-run -a -s "-screen 0 640x480x24" dh_auto_test --max-parallel=1 -- ARGS="-V -E attachtest-gdb"
-else
- -xvfb-run -a -s "-screen 0 640x480x24" dh_auto_test --max-parallel=1 -- ARGS="-V"
-endif
+ :
override_dh_auto_install:
dh_auto_install
@@ -34,3 +34,7 @@ override_dh_auto_install:
override_dh_installdocs:
dh_installdocs --link-doc=gammaray
+
+#execute_after_dh_auto_install:
+# # Reproducible builds: remove build paths from .prl files
+# sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libQt6*.prl
diff --git a/debian/watch b/debian/watch
index e1a6353a..0698f9f8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,5 @@
-version=3
-https://github.com/KDAB/GammaRay/releases /KDAB/GammaRay/releases/download/v?\d\S*/gammaray-(\d\S*).tar.gz
+version=4
+opts="searchmode=plain, \
+filenamemangle=s/.+\/@PACKAGE at -@ANY_VERSION@\.tar\.gz/@PACKAGE at -$1\.tar\.gz/" \
+https://api.github.com/repos/KDAB/GammaRay/releases \
+https://github.com/KDAB/GammaRay/releases/download/v\d[\.\d]*/@PACKAGE at -@ANY_VERSION at .tar.gz
More information about the Neon-commits
mailing list