[neon/qt6/qt6-svg/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:32:57 GMT 2022 

Git commit 159204cd74f06c6f0a5e0dcd4c4b3bd24b248d16 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  +87   -4    debian/changelog
M  +19   -9    debian/control
M  +51   -3    debian/qt6-svg-dev.install
M  +9    -2    debian/rules

https://invent.kde.org/neon/qt6/qt6-svg/commit/159204cd74f06c6f0a5e0dcd4c4b3bd24b248d16

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 50b7526..825617a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,96 @@
-qt6-svg (6.4.0-0neon) UNRELEASED; urgency=medium
+qt6-svg (6.4.1-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (6.4.1).
+  * Bump Qt B-Ds to 6.4.1.
+  * Rename libqt6svg6-dev to qt6-svg-dev.
+
+ -- Patrick Franz <deltaone at debian.org>  Tue, 15 Nov 2022 22:56:36 +0100
+
+qt6-svg (6.4.0-2) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * Enable link time optimization (Closes: #1015623).
+  * Pass QT_HOST_PATH to cmake in cross-builds, thx to Helmut Grohne
+    (Closes: #1023074).
+
+ -- Patrick Franz <deltaone at debian.org>  Sat, 05 Nov 2022 16:58:45 +0100
+
+qt6-svg (6.4.0-1) experimental; urgency=medium
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Bump minimum CMake version in order to ensure we get .pc files.
+  * Add debian/.gitignore and debian/.git-attributes.
+
+  [ 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>  Wed, 05 Oct 2022 20:22:39 +0200
+
+qt6-svg (6.3.1-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Mon, 15 Aug 2022 19:23:56 +0200
+
+qt6-svg (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>  Fri, 15 Jul 2022 20:32:16 +0200
+
+qt6-svg (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>  Sun, 29 May 2022 21:07:20 +0200
+
+qt6-svg (6.2.4-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Fri, 22 Apr 2022 20:07:34 +0200
+
+qt6-svg (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>  Tue, 29 Mar 2022 20:42:55 +0200
+
+qt6-svg (6.2.2-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Tue, 15 Feb 2022 22:15:00 +0100
+
+qt6-svg (6.2.2-1) experimental; urgency=medium
 
   [ Lu YaNing ]
   * Update descriptions.
   * List cmake files in detail.
 
-  [ Jonathan Riddell ]
-  * New release
+  [ Patrick Franz ]
+  * New upstream release (6.2.2).
+  * Bump Qt B-Ds to 6.2.2.
+  * Update installed files.
 
- -- Jonathan Riddell <jr at jriddell.org>  Wed, 02 Feb 2022 15:13:50 +0000
+ -- Patrick Franz <deltaone at debian.org>  Thu, 02 Dec 2021 09:29:20 +0100
 
 qt6-svg (6.2.1-2) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 1c3373c..0444160 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,16 @@ 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,
                libvulkan-dev [linux-any],
                ninja-build,
                pkg-config,
                pkg-kde-tools,
-               qt6-base-dev (>= 6.4.0),
+               qt6-base-dev (>= 6.4.1+dfsg~),
                zlib1g-dev
-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-svg
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-svg.git
@@ -21,9 +21,7 @@ Rules-Requires-Root: no
 Package: qt6-svg
 Architecture: any
 Section: kde
-Provides: libqt6svg6, libqt6svgwidgets6
-Breaks: libqt6svg6 (<< 6.4), libqt6svgwidgets6 (<< 6.4)
-Replaces: libqt6svg6 (<< 6.4), libqt6svgwidgets6 (<< 6.4)
+X-Neon-MergedPackage: true
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 6 SVG library
@@ -40,10 +38,10 @@ Description: Qt 6 SVG library
 Package: qt6-svg-dev
 Architecture: any
 Section: kde
-Provides: libqt6svg6-dev
-Breaks: libqt6svg6-dev (<< 6.4)
-Replaces: libqt6svg6-dev (<< 6.4)
+X-Neon-MergedPackage: true
 Depends: qt6-svg (= ${binary:Version}), ${misc:Depends}
+Breaks: libqt6svg6-dev (<< 6.4.1~)
+Replaces: libqt6svg6-dev (<< 6.4.1~)
 Description: Qt 6 SVG - 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.
@@ -55,3 +53,15 @@ Description: Qt 6 SVG - development files
  .
  This package contains the header development files used for building Qt 6
  applications using QtSvg library.
+
+Package: libqt6svg6
+Architecture: all
+Depends: qt6-svg
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libqt6svgwidgets6
+Architecture: all
+Depends: qt6-svg
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-svg-dev.install b/debian/qt6-svg-dev.install
index 75d7a25..4b24e7c 100644
--- a/debian/qt6-svg-dev.install
+++ b/debian/qt6-svg-dev.install
@@ -1,12 +1,60 @@
-usr/include/
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvg/QSvgGenerator
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvg/QSvgRenderer
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvg/QtSvg
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvg/QtSvgDepends
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvg/QtSvgVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvg/qsvggenerator.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvg/qsvgrenderer.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvg/qtsvgexports.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvg/qtsvgglobal.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvg/qtsvgversion.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvgWidgets/QGraphicsSvgItem
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvgWidgets/QSvgWidget
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvgWidgets/QtSvgWidgets
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvgWidgets/QtSvgWidgetsDepends
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvgWidgets/QtSvgWidgetsVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvgWidgets/qgraphicssvgitem.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvgWidgets/qsvgwidget.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvgWidgets/qtsvgwidgetsexports.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvgWidgets/qtsvgwidgetsglobal.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtSvgWidgets/qtsvgwidgetsversion.h
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtSvgTestsConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QSvgIconPluginAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QSvgIconPluginConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QSvgIconPluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QSvgIconPluginConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QSvgIconPluginTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QSvgIconPluginTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QSvgPluginAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QSvgPluginConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QSvgPluginConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QSvgPluginConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QSvgPluginTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Gui/Qt6QSvgPluginTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Svg/Qt6SvgAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Svg/Qt6SvgConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Svg/Qt6SvgConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Svg/Qt6SvgConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Svg/Qt6SvgDependencies.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Svg/Qt6SvgTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Svg/Qt6SvgTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Svg/Qt6SvgVersionlessTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SvgWidgets/Qt6SvgWidgetsAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SvgWidgets/Qt6SvgWidgetsConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SvgWidgets/Qt6SvgWidgetsConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SvgWidgets/Qt6SvgWidgetsConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SvgWidgets/Qt6SvgWidgetsDependencies.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SvgWidgets/Qt6SvgWidgetsTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SvgWidgets/Qt6SvgWidgetsTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6SvgWidgets/Qt6SvgWidgetsVersionlessTargets.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Svg.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Svg.so
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6SvgWidgets.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6SvgWidgets.so
 usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6svg_*_metatypes.json
 usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6svgwidgets_*_metatypes.json
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6*.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6Svg.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6SvgWidgets.pc
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_svg.pri
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_svgwidgets.pri
 usr/share/qt6/modules/Svg.json
diff --git a/debian/rules b/debian/rules
index a4ea50f..1c464be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,21 @@
 
 include /usr/share/dpkg/architecture.mk
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=-lto
+
+# QT_HOST_PATH isn't passed in cross-builds
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+	extra_cmake_args += -DQT_HOST_PATH=/usr
+endif
 
 %:
 	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) \
+		$(extra_cmake_args)
 	
 execute_after_dh_auto_install:
 	# Reproducible builds: remove build paths from .prl files

More information about the Neon-commits mailing list