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

Tue Dec 6 13:31:42 GMT 2022

Git commit adb04e197801d2e1f8a367fd2d463fca8b28f647 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  +77   -3    debian/changelog
M  +21   -7    debian/control
M  +9    -9    debian/copyright
M  +2    -1    debian/rules

https://invent.kde.org/neon/qt6/qt6-lottie/commit/adb04e197801d2e1f8a367fd2d463fca8b28f647

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 c392d85..022ec7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,82 @@
-qt6-lottie (6.2.3-0neon) UNRELEASED; urgency=medium
+qt6-lottie (6.4.1-2) experimental; urgency=medium
 
-  * New release
+  [ Patrick Franz ]
+  * Rename libqt6bodymovin6-dev to qt6-lottie-dev.
+  * Update d/copyright.
+
+ -- Patrick Franz <deltaone at debian.org>  Wed, 30 Nov 2022 22:36:59 +0100
+
+qt6-lottie (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 19:48:19 +0100
+
+qt6-lottie (6.4.0-2) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * Enable link time optimization (Closes: #1015620).
+
+ -- Patrick Franz <deltaone at debian.org>  Sun, 13 Nov 2022 14:08:18 +0100
+
+qt6-lottie (6.4.0-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (6.4.0).
+  * Bump Qt B-Ds to 6.4.0.
+  * Bump minimum CMake version in order to get pkg-config's .pc files.
+  * Increase CMake verbosity level.
+  * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org>  Sat, 15 Oct 2022 18:30:57 +0200
+
+qt6-lottie (6.3.1-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Mon, 15 Aug 2022 19:22:47 +0200
+
+qt6-lottie (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).
+
+ -- Patrick Franz <deltaone at debian.org>  Sun, 17 Jul 2022 14:52:50 +0200
+
+qt6-lottie (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>  Tue, 14 Jun 2022 21:35:51 +0200
+
+qt6-lottie (6.2.4-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Fri, 22 Apr 2022 20:06:44 +0200
+
+qt6-lottie (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:12:15 +0200
+
+qt6-lottie (6.2.2-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
 
- -- Jonathan Riddell <jr at jriddell.org>  Wed, 02 Feb 2022 15:13:50 +0000
+ -- Patrick Franz <deltaone at debian.org>  Tue, 15 Feb 2022 22:39:14 +0100
 
 qt6-lottie (6.2.2-1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 6f5164e..9023053 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,9 +11,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-lottie
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-lottie.git
@@ -22,9 +22,9 @@ Rules-Requires-Root: no
 Package: qt6-lottie
 Architecture: any
 Section: kde
-Provides: libqt6bodymovin6, qml6-module-qt-labs-lottieqt
+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 Lottie Bodymovin library
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -34,11 +34,25 @@ Description: Qt 6 Lottie Bodymovin library
 Package: qt6-lottie-dev
 Architecture: any
 Section: kde
-Provides: libqt6bodymovin6-dev
+X-Neon-MergedPackage: true
 Depends: qt6-base-dev, qt6-lottie (= ${binary:Version}), ${misc:Depends}
+Breaks: libqt6bodymovin6-dev (<< 6.4.1-2~)
+Replaces: libqt6bodymovin6-dev (<< 6.4.1-2~)
 Description: Qt 6 Lottie - 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 used for building Qt 6
  applications using Qt Lottie libraries.
+
+Package: libqt6bodymovin6
+Architecture: all
+Depends: qt6-lottie
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qml6-module-qt-labs-lottieqt
+Architecture: all
+Depends: qt6-lottie
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index 58bee54..ad6966f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,12 @@ Source: https://download.qt.io/archive/qt/*/submodules/
 
 Files: *
 Copyright: 2018 The Qt Company Ltd.
-License: GPL-3+
+License: GPL-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+
+License: GPL-3
 
 Files: conanfile.py
 Copyright: 2021 The Qt Company Ltd.
@@ -19,13 +19,13 @@ Files: *.qdoc
 Copyright: 2019 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
-License: GPL-3+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 3 or (at
- your option) any later version approved by the KDE Free Qt Foundation.
- The licenses are as published by the Free Software Foundation.
+License: GPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
  .
- This package is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
diff --git a/debian/rules b/debian/rules
index 1d2719a..93dfa08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,14 @@
 #!/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 -- \
+		--log-level=STATUS \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
 
 execute_after_dh_auto_install:
