[neon/qt6/qt6-5compat/Neon/release] debian: merge with salsa

Jonathan Esk-Riddell null at kde.org
Mon Dec 5 17:00:20 GMT 2022 

Git commit 663432884522a6ef7bea877e6bb5faf368447fe3 by Jonathan Esk-Riddell.
Committed on 05/12/2022 at 17:00.
Pushed by jriddell into branch 'Neon/release'.

merge with salsa

A  +1    -0    debian/.gitattributes
A  +1    -0    debian/.gitignore
M  +102  -3    debian/changelog
M  +21   -6    debian/control
M  +0    -3    debian/not-installed
M  +2    -1    debian/qt6-5compat-dev.install
M  +17   -0    debian/qt6-5compat.install
M  +11   -2    debian/rules

https://invent.kde.org/neon/qt6/qt6-5compat/commit/663432884522a6ef7bea877e6bb5faf368447fe3

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 ccae50c..e4ace38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,107 @@
-qt6-5compat (6.2.3-0neon) UNRELEASED; urgency=medium
+qt6-5compat (6.4.1-2) experimental; urgency=medium
 
-  * New release
+  [ Patrick Franz ]
+  * Rename libqt6core5compat6-dev to qt6-5compat-dev.
+
+ -- Patrick Franz <deltaone at debian.org>  Sun, 27 Nov 2022 20:19:31 +0100
+
+qt6-5compat (6.4.1-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (6.4.1).
+  * Bump Qt B-Ds to 6.4.1.
+
+ -- Patrick Franz <deltaone at debian.org>  Thu, 17 Nov 2022 16:36:24 +0100
+
+qt6-5compat (6.4.0-3) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * Enable link time optimization (Closes: #1015616).
+
+ -- Patrick Franz <deltaone at debian.org>  Sun, 13 Nov 2022 11:26:50 +0100
+
+qt6-5compat (6.4.0-2) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * Pass QT_HOST_PATH to cmake in cross-builds, thx to Helmut Grohne
+    (Closes: #1022986).
+
+ -- Patrick Franz <deltaone at debian.org>  Mon, 31 Oct 2022 20:10:33 +0100
+
+qt6-5compat (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 list of installed files.
+  * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org>  Sun, 16 Oct 2022 00:07:17 +0200
+
+qt6-5compat (6.3.1-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Mon, 15 Aug 2022 19:22:22 +0200
+
+qt6-5compat (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 10:43:56 +0200
+
+qt6-5compat (6.3.0-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (6.3.0).
+  * Bump Qt B-Ds to 6.3.0.
+
+ -- Patrick Franz <deltaone at debian.org>  Wed, 15 Jun 2022 01:49:01 +0200
+
+qt6-5compat (6.2.4-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Fri, 22 Apr 2022 20:06:15 +0200
+
+qt6-5compat (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:48:37 +0200
+
+qt6-5compat (6.2.2-5) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Tue, 15 Feb 2022 22:32:17 +0100
+
+qt6-5compat (6.2.2-4) experimental; urgency=medium
+
+  [ Daniel Schürmann ]
+  * Add dependent module Qt5Compat.GraphicalEffects.private.
+
+ -- Patrick Franz <deltaone at debian.org>  Mon, 07 Feb 2022 19:30:02 +0100
+
+qt6-5compat (6.2.2-3) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * Update symbols from buildlogs.
 
- -- Jonathan Riddell <jr at jriddell.org>  Wed, 02 Feb 2022 15:13:49 +0000
+ -- Patrick Franz <deltaone at debian.org>  Mon, 03 Jan 2022 17:26:54 +0100
 
 qt6-5compat (6.2.2-2) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 92695ce..db51b53 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,19 @@ 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,
                libicu-dev,
+               libqt6shadertools6-dev (>= 6.4.1~),
                libssl-dev,
                libvulkan-dev [linux-any],
                ninja-build,
                pkg-config,
                pkg-kde-tools,
-               qt6-base-dev (>= 6.2.2+dfsg~),
-               qt6-declarative-dev (>= 6.2.2+dfsg~)
-Standards-Version: 4.6.0
+               qt6-base-dev (>= 6.4.1+dfsg~),
+               qt6-declarative-dev (>= 6.4.1+dfsg~)
+Standards-Version: 4.6.1
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-5compat
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-5compat.git
@@ -23,7 +24,7 @@ Rules-Requires-Root: no
 Package: qt6-5compat
 Architecture: any
 Section: kde
-Provides: libqt6core5compat6, qml6-module-qt5compat-graphicaleffects
+X-Neon-MergedPackage: true
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: Qt 6 Qt5Compat library
@@ -35,11 +36,25 @@ Description: Qt 6 Qt5Compat library
 Package: qt6-5compat-dev
 Architecture: any
 Section: kde
-Provides: libqt6core5compat6-dev
+X-Neon-MergedPackage: true
 Depends: qt6-5compat (= ${binary:Version}), qt6-base-dev, ${misc:Depends}
+Breaks: libqt6core5compat6-dev (<< 6.4.1-1~)
+Replaces: libqt6core5compat6-dev (<< 6.4.1-1~)
 Description: Qt 6 Qt5Compat - 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.
  .
  This package contains the development files needed to build Qt 6 applications
  using the Core5Compat library.
+
+Package: libqt6core5compat6
+Architecture: all
+Depends: qt6-5compat
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qt5compat-graphicaleffects
+Architecture: all
+Depends: qt6-5compat
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/not-installed b/debian/not-installed
index ec64397..5e46c7b 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -12,6 +12,3 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectspriva
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateTargets-none.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Qml/QmlPlugins/Qt6qtgraphicaleffectsprivateTargets.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_core5compat_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/private/FastGlow.qml
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/private/libqtgraphicaleffectsprivateplugin.so
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/private/qmldir
diff --git a/debian/qt6-5compat-dev.install b/debian/qt6-5compat-dev.install
index 68ad521..af886cf 100644
--- a/debian/qt6-5compat-dev.install
+++ b/debian/qt6-5compat-dev.install
@@ -48,6 +48,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Core5Compat/Qt6Core5CompatTargets.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6Core5Compat/Qt6Core5CompatVersionlessTargets.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Core5Compat.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Core5Compat.so
-usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6core5compat_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6core5compat_none_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6Core5Compat.pc
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_core5compat.pri
 usr/share/qt6/modules/Core5Compat.json
diff --git a/debian/qt6-5compat.install b/debian/qt6-5compat.install
index 2dbc691..986c8e8 100644
--- a/debian/qt6-5compat.install
+++ b/debian/qt6-5compat.install
@@ -1,21 +1,38 @@
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6Core5Compat.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/Blend.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/BrightnessContrast.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/ColorOverlay.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/Colorize.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/ConicalGradient.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/Desaturate.qml
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/DirectionalBlur.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/Displace.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/DropShadow.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/FastBlur.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/GammaAdjust.qml
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/GaussianBlur.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/Glow.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/HueSaturation.qml
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/InnerShadow.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/LevelAdjust.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/LinearGradient.qml
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/MaskedBlur.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/OpacityMask.qml
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/RadialBlur.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/RadialGradient.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/RectangularGlow.qml
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/RecursiveBlur.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/ThresholdMask.qml
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/ZoomBlur.qml
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/libqtgraphicaleffectsplugin.so
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/plugins.qmltypes
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/private/DropShadowBase.qml
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/private/FastGlow.qml
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/private/FastInnerShadow.qml
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianDirectionalBlur.qml
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianGlow.qml
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianInnerShadow.qml
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/private/GaussianMaskedBlur.qml
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/private/libqtgraphicaleffectsprivateplugin.so
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/private/qmldir
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt5Compat/GraphicalEffects/qmldir
diff --git a/debian/rules b/debian/rules
index 273b07d..847a60b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,23 @@
 
 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 \
+	-DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_HOST_MULTIARCH}/cmake
+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