[neon/qt6/qt6-datavis3d/Neon/release] debian: revert to salsa experimental for qt 6.4.1 and run qt_sixy

Jonathan Esk-Riddell null at kde.org
Tue Dec 6 13:31:24 GMT 2022 

Git commit ec9577147e39a262c5e2906da0da5f6f164cc163 by Jonathan Esk-Riddell.
Committed on 06/12/2022 at 13:30.
Pushed by jriddell into branch 'Neon/release'.

revert to salsa experimental for qt 6.4.1 and run qt_sixy

A  +1    -0    debian/.gitattributes
A  +1    -0    debian/.gitignore
M  +85   -3    debian/changelog
M  +33   -7    debian/control
M  +2    -2    debian/copyright
M  +3    -1    debian/not-installed
M  +26   -0    debian/qt6-datavis3d-dev.install
M  +2    -1    debian/qt6-datavis3d.install
M  +2    -1    debian/rules

https://invent.kde.org/neon/qt6/qt6-datavis3d/commit/ec9577147e39a262c5e2906da0da5f6f164cc163

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..027271b
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1 @@
+files
diff --git a/debian/changelog b/debian/changelog
index 0c39266..67955d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,90 @@
-qt6-datavis3d (6.2.3-0neon) UNRELEASED; urgency=medium
+qt6-datavis3d (6.4.1-1) experimental; urgency=medium
 
-  * New release
+  [ Patrick Franz ]
+  * New upstream release (6.4.1).
+  * Bump Qt B-Ds to 6.4.1.
 
- -- Jonathan Riddell <jr at jriddell.org>  Wed, 02 Feb 2022 15:13:50 +0000
+ -- Patrick Franz <deltaone at debian.org>  Thu, 17 Nov 2022 19:42:05 +0100
+
+qt6-datavis3d (6.4.0-1) experimental; urgency=medium
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Bump minimum CMake version in order to get pkg-config's .pc files.
+
+  [ Patrick Franz ]
+  * Increase CMake verbosity level.
+  * New upstream release (6.4.0).
+  * Bump Qt B-Ds to 6.4.0.
+  * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org>  Sun, 16 Oct 2022 00:27:05 +0200
+
+qt6-datavis3d (6.3.1-3) unstable; urgency=medium
+
+  * Team upload.
+  * Rename libqt6datavisualization6-dev to qt6-datavisualization-dev, as it
+    ships two libraries.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Thu, 25 Aug 2022 17:43:03 -0300
+
+qt6-datavis3d (6.3.1-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Mon, 15 Aug 2022 19:22:33 +0200
+
+qt6-datavis3d (6.3.1-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (6.3.1).
+  * Bump Qt B-Ds to 6.3.1.
+  * Bump Standards-Version to 4.6.1 (no changes needed).
+  * Update list of installed files.
+
+ -- Patrick Franz <deltaone at debian.org>  Sun, 17 Jul 2022 14:47:19 +0200
+
+qt6-datavis3d (6.3.0-2) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * Make libqt6datavisualization6-dev depend on
+    libqt6datavisualizationqml6.
+
+ -- Patrick Franz <deltaone at debian.org>  Mon, 20 Jun 2022 23:31:42 +0200
+
+qt6-datavis3d (6.3.0-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (6.3.0).
+  * Bump Qt B-Ds to 6.3.0.
+  * Update list of installed files.
+  * New binary package libqt6datavisualizationqml6.
+  * Update symbols from buildlogs.
+  * Update d/copyright.
+
+ -- Patrick Franz <deltaone at debian.org>  Wed, 15 Jun 2022 01:36:21 +0200
+
+qt6-datavis3d (6.2.4-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Fri, 22 Apr 2022 20:06:32 +0200
+
+qt6-datavis3d (6.2.4-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (6.2.4).
+  * Bump Qt B-Ds to 6.2.4.
+
+ -- Patrick Franz <deltaone at debian.org>  Thu, 31 Mar 2022 00:07:29 +0200
+
+qt6-datavis3d (6.2.2-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Tue, 15 Feb 2022 22:37:47 +0100
 
 qt6-datavis3d (6.2.2-1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index b20cfce..7d433af 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Patrick Franz <deltaone at debian.org>, Lu YaNing <dluyaning at gmail.com>
-Build-Depends: cmake (>= 3.18~),
+Build-Depends: cmake (>= 3.24~),
                debhelper-compat (= 13),
                libgl-dev,
                libssl-dev,
@@ -11,11 +11,11 @@ Build-Depends: cmake (>= 3.18~),
                ninja-build,
                pkg-config,
                pkg-kde-tools,
-               qt6-base-dev (>= 6.2.3),
-               qt6-declarative-dev (>= 6.2.3),
+               qt6-base-dev (>= 6.4.1+dfsg~),
+               qt6-declarative-dev (>= 6.4.1+dfsg~),
                xauth <!nocheck>,
                xvfb <!nocheck>
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-datavis3d
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-datavis3d.git
@@ -24,9 +24,9 @@ Rules-Requires-Root: no
 Package: qt6-datavis3d
 Architecture: any
 Section: kde
-Provides: libqt6datavisualization6, qml6-module-qtdatavisualization
+X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: qml6-module-qtquick, ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 6 Data Visualization library
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -37,7 +37,9 @@ Description: Qt 6 Data Visualization library
 Package: qt6-datavis3d-dev
 Architecture: any
 Section: kde
-Provides: libqt6datavisualization6-dev
+X-Neon-MergedPackage: true
+Breaks: libqt6datavisualization6-dev (<< 6.3.1-3~)
+Replaces: libqt6datavisualization6-dev (<< 6.3.1-3~)
 Depends: qt6-base-dev, qt6-datavis3d (= ${binary:Version}), ${misc:Depends}
 Description: Qt 6 Data Visualization - development files
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -45,3 +47,27 @@ Description: Qt 6 Data Visualization - development files
  .
  This package contains the development files needed to build Qt applications
  using the Qt Data Visualization library.
+
+Package: libqt6datavisualization6
+Architecture: all
+Depends: qt6-datavis3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6datavisualizationqml6
+Architecture: all
+Depends: qt6-datavis3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qtdatavisualization
+Architecture: all
+Depends: qt6-datavis3d
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-datavisualization-dev
+Architecture: all
+Depends: qt6-datavis3d-dev
+Description: Dummy transitional
+  Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index 78c8bd4..79fec80 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: qtdatavis3d-everywhere-src
 Source: https://download.qt.io/archive/qt/*/submodules/
 
 Files: *
-Copyright: 2016-2021 The Qt Company Ltd.
+Copyright: 2016-2022 The Qt Company Ltd.
 License: GPL-3
 
 Files: examples/datavisualization/texturesurface/*.png
@@ -21,7 +21,7 @@ Copyright: 2016 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
 Files: debian/*
-Copyright: 2021 Patrick Franz <deltaone at debian.org>
+Copyright: 2021-2022 Patrick Franz <deltaone at debian.org>
            2021 Lu YaNing <dluyaning at gmail.com>
 License: GPL-3
 
diff --git a/debian/not-installed b/debian/not-installed
index 23dd7a5..8d72946 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,5 +1,7 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualization/6.*
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualization/*/QtDataVisualization/private/*.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualizationQml/*/QtDataVisualizationQml/private/*.h
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_datavisualization_private.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_datavisualizationqml_private.pri
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQml2AdditionalTargetInfo.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQml2Config.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQml2ConfigVersion.cmake
diff --git a/debian/qt6-datavis3d-dev.install b/debian/qt6-datavis3d-dev.install
index 381d3f3..f374868 100644
--- a/debian/qt6-datavis3d-dev.install
+++ b/debian/qt6-datavis3d-dev.install
@@ -75,11 +75,16 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualization/qsurface3dseries.h
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualization/qsurfacedataitem.h
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualization/qsurfacedataproxy.h
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualization/qtdatavisualization-config.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualization/qtdatavisualizationexports.h
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualization/qtdatavisualizationversion.h
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualization/qtouch3dinputhandler.h
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualization/qutils.h
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualization/qvalue3daxis.h
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualization/qvalue3daxisformatter.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualizationQml/QtDataVisualizationQml
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualizationQml/QtDataVisualizationQmlDepends
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualizationQml/QtDataVisualizationQmlVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtDataVisualizationQml/qtdatavisualizationqmlversion.h
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtDataVisualizationTestsConfig.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6DataVisualization/Qt6DataVisualizationAdditionalTargetInfo.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6DataVisualization/Qt6DataVisualizationConfig.cmake
@@ -89,8 +94,29 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6DataVisualization/Qt6DataVisualizationDep
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6DataVisualization/Qt6DataVisualizationTargets-*.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6DataVisualization/Qt6DataVisualizationTargets.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6DataVisualization/Qt6DataVisualizationVersionlessTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlDependencies.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6DataVisualizationQml/Qt6DataVisualizationQmlVersionlessTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQmlpluginAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQmlpluginConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQmlpluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQmlpluginConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQmlpluginTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6DataVisualizationQmlpluginTargets.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6DataVisualization.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6DataVisualization.so
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6DataVisualizationQml.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6DataVisualizationQml.so
 usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6datavisualization_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6datavisualizationqml_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6DataVisualization.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6DataVisualizationQml.pc
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_datavisualization.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_datavisualizationqml.pri
 usr/share/qt6/modules/DataVisualization.json
+usr/share/qt6/modules/DataVisualizationQml.json
diff --git a/debian/qt6-datavis3d.install b/debian/qt6-datavis3d.install
index c31a8fd..11cca1a 100644
--- a/debian/qt6-datavis3d.install
+++ b/debian/qt6-datavis3d.install
@@ -1,4 +1,5 @@
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6DataVisualization.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libQt6DataVisualizationQml.so.*
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtDataVisualization/designer/Bars3DSpecifics.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtDataVisualization/designer/Scatter3DSpecifics.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtDataVisualization/designer/Surface3DSpecifics.qml
@@ -7,6 +8,6 @@ usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtDataVisualization/designer/default/Scatt
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtDataVisualization/designer/default/Surface3D.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtDataVisualization/designer/images
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtDataVisualization/designer/qtdatavisualization.metainfo
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtDataVisualization/libdatavisualizationqml2plugin.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtDataVisualization/libdatavisualizationqmlplugin.so
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtDataVisualization/plugins.qmltypes
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtDataVisualization/qmldir
diff --git a/debian/rules b/debian/rules
index 884c737..62ab791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+		--log-level=STATUS \
+		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
 
 execute_after_dh_auto_install:
 	# Reproducible builds: remove build paths from .prl files

More information about the Neon-commits mailing list