[neon/qt6/qt6-charts/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:12 GMT 2022
Git commit 6452ca14729e74be80e943fef9e22033cc2d204b 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 +100 -4 debian/changelog
M +28 -8 debian/control
M +1 -1 debian/copyright
M +27 -1 debian/qt6-charts-dev.install
M +3 -2 debian/rules
https://invent.kde.org/neon/qt6/qt6-charts/commit/6452ca14729e74be80e943fef9e22033cc2d204b
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 7742867..a029d74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,105 @@
-qt6-charts (6.2.3-0neon) UNRELEASED; urgency=medium
+qt6-charts (6.4.1-1) experimental; urgency=medium
- * new release
- * 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:49 +0000
+ -- Patrick Franz <deltaone at debian.org> Thu, 17 Nov 2022 19:31:05 +0100
+
+qt6-charts (6.4.0-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Enable link time optimization (Closes: #1015618).
+
+ -- Patrick Franz <deltaone at debian.org> Sun, 13 Nov 2022 12:05:38 +0100
+
+qt6-charts (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:15:13 +0200
+
+qt6-charts (6.3.1-3) unstable; urgency=medium
+
+ * Team upload.
+ * Rename libqt6chart6-dev to qt6-charts-dev, as this source package ships
+ more than one library.
+ - No current reverse dependencies are affected.
+ - Add libqt6chartsqml6 as a dependency of this package.
+ * Update symbols files with current build log.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org> Thu, 01 Sep 2022 18:33:15 -0300
+
+qt6-charts (6.3.1-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 15 Aug 2022 19:22:26 +0200
+
+qt6-charts (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 11:33:59 +0200
+
+qt6-charts (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.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Tue, 14 Jun 2022 21:48:48 +0200
+
+qt6-charts (6.2.4-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Fri, 22 Apr 2022 20:06:25 +0200
+
+qt6-charts (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> Wed, 30 Mar 2022 21:55:04 +0200
+
+qt6-charts (6.2.2-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Tue, 15 Feb 2022 22:34:05 +0100
+
+qt6-charts (6.2.2-1) experimental; urgency=medium
+
+ [ Lu YaNing ]
+ * Fix d/copyright Upstream-Name.
+ * List cmake files in detail.
+ * Update descriptions.
+ * Update symbols.
+
+ [ Patrick Franz ]
+ * New upstream release (6.2.2).
+ * Bump Qt B-Ds to 6.2.2.
+ * Update installed files.
+
+ -- Patrick Franz <deltaone at debian.org> Fri, 03 Dec 2021 17:13:38 +0100
qt6-charts (6.2.1-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index f7db616..dcd4f86 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.1+dfsg~),
- qt6-declarative-dev (>= 6.2.1+dfsg~),
+ 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-charts
Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-charts.git
@@ -24,9 +24,9 @@ Rules-Requires-Root: no
Package: qt6-charts
Architecture: any
Section: kde
-Provides: libqt6charts6, libqt6chartsqml6, qml6-module-qtcharts
+X-Neon-MergedPackage: true
Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 6 charts module
+Description: Qt 6 charts 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,9 +37,11 @@ Description: Qt 6 charts module
Package: qt6-charts-dev
Architecture: any
Section: kde
-Provides: libqt6charts6-dev
+X-Neon-MergedPackage: true
Depends: qt6-base-dev, qt6-charts (= ${binary:Version}), ${misc:Depends}
-Description: Qt 6 charts development files
+Breaks: libqt6charts6-dev (<< 6.3.1-3~)
+Replaces: libqt6charts6-dev (<< 6.3.1-3~)
+Description: Qt 6 charts - development files
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
@@ -47,3 +49,21 @@ Description: Qt 6 charts development files
.
This package contains the header development files used for building Qt 6
applications using QtCharts.
+
+Package: libqt6charts6
+Architecture: all
+Depends: qt6-charts
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6chartsqml6
+Architecture: all
+Depends: qt6-charts
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qtcharts
+Architecture: all
+Depends: qt6-charts
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index 2e86f6e..af0730d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: qt6-charts
+Upstream-Name: qtcharts-everywhere-src
Source: https://download.qt.io/archive/qt/*/submodules/
Files: *
diff --git a/debian/qt6-charts-dev.install b/debian/qt6-charts-dev.install
index fd36438..bc96ba1 100644
--- a/debian/qt6-charts-dev.install
+++ b/debian/qt6-charts-dev.install
@@ -101,6 +101,7 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtCharts/qscatterseries.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtCharts/qsplineseries.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtCharts/qstackedbarseries.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtCharts/qtcharts-config.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtCharts/qtchartsexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtCharts/qtchartsversion.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtCharts/qvalueaxis.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtCharts/qvbarmodelmapper.h
@@ -114,14 +115,39 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtCharts/qxyseries.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtChartsQml/QtChartsQml
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtChartsQml/QtChartsQmlDepends
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtChartsQml/QtChartsQmlVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtChartsQml/qtchartsqmlexports.h
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtChartsQml/qtchartsqmlversion.h
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/*
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtChartsTestsConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Charts/Qt6ChartsAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Charts/Qt6ChartsConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Charts/Qt6ChartsConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Charts/Qt6ChartsConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Charts/Qt6ChartsDependencies.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Charts/Qt6ChartsTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Charts/Qt6ChartsTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Charts/Qt6ChartsVersionlessTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ChartsQml/Qt6ChartsQmlAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ChartsQml/Qt6ChartsQmlConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ChartsQml/Qt6ChartsQmlConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ChartsQml/Qt6ChartsQmlConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ChartsQml/Qt6ChartsQmlDependencies.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ChartsQml/Qt6ChartsQmlTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ChartsQml/Qt6ChartsQmlTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ChartsQml/Qt6ChartsQmlVersionlessTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtchartsqml2AdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtchartsqml2Config.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtchartsqml2ConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtchartsqml2ConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtchartsqml2Targets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtchartsqml2Targets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/libQt6Charts.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6Charts.so
usr/lib/${DEB_HOST_MULTIARCH}/libQt6ChartsQml.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6ChartsQml.so
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6charts_*_metatypes.json
usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6chartsqml_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6Charts.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6ChartsQml.pc
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_charts.pri
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_chartsqml.pri
usr/share/qt6/modules/Charts.json
diff --git a/debian/rules b/debian/rules
index 9774ec0..e2cde0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,15 @@
#!/usr/bin/make -f
include /usr/share/dpkg/architecture.mk
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
%:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
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