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

[Jonathan Esk-Riddell]

Git commit f0e843fb8defde4e6c5b5604779f4a97cb541757 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  +75   -5    debian/changelog
M  +5    -3    debian/control
A  +0    -0    debian/qt6-imageformats.install
M  +1    -3    debian/rules

https://invent.kde.org/neon/qt6/qt6-imageformats/commit/f0e843fb8defde4e6c5b5604779f4a97cb541757

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 19e1797..540e5ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,87 @@
-qt6-imageformats (6.2.3-0neon) UNRELEASED; urgency=medium
+qt6-imageformats (6.4.1-1) experimental; urgency=medium
 
-  * New release
+  [ Patrick Franz ]
+  * New upstream release (6.4.1).
+  * Bump Qt B-Ds to 6.4.1.
+
+ -- Patrick Franz <deltaone at debian.org>  Tue, 15 Nov 2022 23:02:32 +0100
+
+qt6-imageformats (6.4.0-1) experimental; urgency=medium
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add debian/.gitattributes to easily merge changelogs.
+  * Move .gitignore in root dir to debian/.
+
+  [ Patrick Franz ]
+  * Increase CMake verbosity level.
+  * New upstream release (6.4.0).
+  * Bump Qt B-Ds to 6.4.0.
+
+ -- Patrick Franz <deltaone at debian.org>  Wed, 05 Oct 2022 20:31:13 +0200
+
+qt6-imageformats (6.3.1-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Mon, 15 Aug 2022 19:22:35 +0200
+
+qt6-imageformats (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>  Fri, 15 Jul 2022 20:47:13 +0200
+
+qt6-imageformats (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>  Sun, 29 May 2022 20:15:51 +0200
+
+qt6-imageformats (6.2.4-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Fri, 22 Apr 2022 20:06:41 +0200
+
+qt6-imageformats (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:24:46 +0200
+
+qt6-imageformats (6.2.2-2) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org>  Tue, 15 Feb 2022 22:16:52 +0100
+
+qt6-imageformats (6.2.2-1) experimental; urgency=medium
+
+  [ Patrick Franz ]
+  * New upstream release (6.2.2).
+  * Bump Qt B-Ds to 6.2.2.
+  * Update description.
 
- -- Jonathan Riddell <jr at jriddell.org>  Wed, 02 Feb 2022 15:13:51 +0000
+ -- Patrick Franz <deltaone at debian.org>  Thu, 02 Dec 2021 09:36:51 +0100
 
-qt6-imageformats (6.2.2-0neon) experimental; urgency=medium
+qt6-imageformats (6.2.1-2) experimental; urgency=medium
 
   [ Patrick Franz ]
   * Source-only upload to experimental.
 
  -- Patrick Franz <deltaone at debian.org>  Sun, 21 Nov 2021 01:56:56 +0100
 
-qt6-imageformats (6.2.2-0neon) experimental; urgency=medium
+qt6-imageformats (6.2.1-1) experimental; urgency=medium
 
   * Initial release (Closes: #998332)
 
diff --git a/debian/control b/debian/control
index 5790ae6..f4f2d64 100644
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,14 @@ Build-Depends: cmake (>= 3.18~),
                debhelper-compat (= 13),
                libgl-dev,
                libmng-dev,
+               libqt6opengl6-dev (>= 6.4.1+dfsg~),
                libtiff-dev,
                libwebp-dev,
                ninja-build,
                pkg-config,
-               qt6-base-dev (>= 6.2.1+dfsg~),
-Standards-Version: 4.6.0
+               qt6-base-dev (>= 6.4.1+dfsg~),
+               qt6-base-private-dev (>= 6.4.1+dfsg~),
+Standards-Version: 4.6.1
 Homepage: https://www.qt.io/developers/
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-imageformats.git
@@ -22,7 +24,7 @@ Package: qt6-image-formats-plugins
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 6 Image Formats module
+Description: Qt 6 Image Formats plugins
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
diff --git a/debian/qt6-imageformats.install b/debian/qt6-imageformats.install
new file mode 100644
index 0000000..e69de29
diff --git a/debian/rules b/debian/rules
index 84a3e16..8b89630 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,5 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
+		--log-level=STATUS \
 		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
-
-override_dh_dwz:
-	true