[neon/qt6/qt6-quicktimeline/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:12 GMT 2022 

Git commit 5abaac63671bdb254c7d726a64bb7e77ccc63d14 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  +82   -3    debian/changelog
M  +20   -6    debian/control
M  +2    -0    debian/qt6-quicktimeline-dev.install
M  +9    -4    debian/rules

https://invent.kde.org/neon/qt6/qt6-quicktimeline/commit/5abaac63671bdb254c7d726a64bb7e77ccc63d14

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 b688994..f059a44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,87 @@
-qt6-quicktimeline (6.2.3-0neon) UNRELEASED; urgency=medium
+qt6-quicktimeline (6.4.1-2) experimental; urgency=medium
 
-  * New release
+  [ Patrick Franz ]
+  * Rename libqt6quicktimeline6-dev to qt6-quicktimeline-dev.
+  * Enable link time optimization.
+
+ -- Patrick Franz <deltaone at debian.org>  Wed, 30 Nov 2022 23:06:01 +0100
+
+qt6-quicktimeline (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:11:39 +0100
+
+qt6-quicktimeline (6.4.0-2) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * Pass QT_HOST_PATH to cmake in cross-builds, thx to Helmut Grohne
+    (Closes: #1023158).
+
+ -- Patrick Franz <deltaone at debian.org>  Sat, 12 Nov 2022 15:51:18 +0100
+
+qt6-quicktimeline (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>  Sat, 15 Oct 2022 18:23:48 +0200
+
+qt6-quicktimeline (6.3.1-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Mon, 15 Aug 2022 19:23:31 +0200
+
+qt6-quicktimeline (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 16:38:57 +0200
+
+qt6-quicktimeline (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.
+
+ -- Patrick Franz <deltaone at debian.org>  Tue, 14 Jun 2022 21:31:04 +0200
+
+qt6-quicktimeline (6.2.4-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Fri, 22 Apr 2022 20:07:06 +0200
+
+qt6-quicktimeline (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:24:32 +0200
+
+qt6-quicktimeline (6.2.2-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
 
- -- Jonathan Riddell <jr at jriddell.org>  Wed, 02 Feb 2022 15:13:49 +0000
+ -- Patrick Franz <deltaone at debian.org>  Tue, 15 Feb 2022 22:12:09 +0100
 
 qt6-quicktimeline (6.2.2-1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 746abd0..2c4c363 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>
-Build-Depends: cmake (>= 3.18~),
+Build-Depends: cmake (>= 3.24~),
                debhelper-compat (= 13),
                libgl-dev,
                libssl-dev,
@@ -12,9 +12,9 @@ Build-Depends: cmake (>= 3.18~),
                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-quicktimeline
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-quicktimeline.git
@@ -23,7 +23,7 @@ Rules-Requires-Root: no
 Package: qt6-quicktimeline
 Architecture: any
 Section: kde
-Provides: libqt6quicktimeline6, qml6-module-qtquick-timeline
+X-Neon-MergedPackage: true
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 6 Quick Timeline library
  Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -34,11 +34,25 @@ Description: Qt 6 Quick Timeline library
 Package: qt6-quicktimeline-dev
 Architecture: any
 Section: kde
-Provides: libqt6quicktimeline6-dev
+X-Neon-MergedPackage: true
 Depends: qt6-quicktimeline (= ${binary:Version}), ${misc:Depends}
+Breaks: libqt6quicktimeline6-dev (<< 6.4.1-2~)
+Replaces: libqt6quicktimeline6-dev (<< 6.4.1-2~)
 Description: Qt 6 Quick Timeline - 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 header development files for building some
  Qt 6 applications using Qt 6 Quick Timeline headers.
+
+Package: libqt6quicktimeline6
+Architecture: all
+Depends: qt6-quicktimeline
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qtquick-timeline
+Architecture: all
+Depends: qt6-quicktimeline
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-quicktimeline-dev.install b/debian/qt6-quicktimeline-dev.install
index 2703aa7..6f38303 100644
--- a/debian/qt6-quicktimeline-dev.install
+++ b/debian/qt6-quicktimeline-dev.install
@@ -2,6 +2,7 @@ usr/include/${DEB_HOST_MULTIARCH}/qt6/QtQuickTimeline/6.*/QtQuickTimeline/privat
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtQuickTimeline/QtQuickTimeline
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtQuickTimeline/QtQuickTimelineDepends
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtQuickTimeline/QtQuickTimelineVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtQuickTimeline/qtquicktimelineexports.h
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtQuickTimeline/qtquicktimelineglobal.h
 usr/include/${DEB_HOST_MULTIARCH}/qt6/QtQuickTimeline/qtquicktimelineversion.h
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtQuickTimelineTestsConfig.cmake
@@ -22,6 +23,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6QuickTimeline/Qt6QuickTimelineVersionless
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6QuickTimeline.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt6QuickTimeline.so
 usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6quicktimeline_*_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6QuickTimeline.pc
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_quicktimeline.pri
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_quicktimeline_private.pri
 usr/share/qt6/modules/QuickTimeline.json
diff --git a/debian/rules b/debian/rules
index 07ac2b3..cb84539 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,22 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE = 1
 
-# Use already defined DEB_HOST_* variables.
 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))
+	cmake_extra_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) \
+		$(cmake_extra_args)
 
 execute_after_dh_auto_install:
 	# Reproducible builds: remove build paths from .prl files

More information about the Neon-commits mailing list