[neon/backports-jammy/kimageannotator/Neon/stable] debian: qt6ify

[Jonathan Esk-Riddell]

Git commit 6e602ae6a3322afb492ff5a597e04bdc991222de by Jonathan Esk-Riddell.
Committed on 16/01/2024 at 17:50.
Pushed by jriddell into branch 'Neon/stable'.

qt6ify

M  +6    -0    debian/changelog
M  +9    -25   debian/control
M  +3    -5    debian/rules

https://invent.kde.org/neon/backports-jammy/kimageannotator/-/commit/6e602ae6a3322afb492ff5a597e04bdc991222de

diff --git a/debian/changelog b/debian/changelog
index 73566c4..26ff712 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kimageannotator (0.7.0-0neon1) UNRELEASED; urgency=medium
+
+  * New release with Qt 6
+
+ -- Jonathan Esk-Riddell <jr at jriddell.org>  Tue, 16 Jan 2024 14:42:53 +0000
+
 kimageannotator (0.6.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 3a85261..4bc97e0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,24 +5,23 @@ Maintainer: Boyuan Yang <byang at debian.org>
 Build-Depends:
  debhelper-compat (= 13),
  cmake,
- qtbase5-dev,
- libkcolorpicker-dev (>= 0.2.0~),
- qttools5-dev-tools,
- qttools5-dev,
- libqt5svg5-dev,
+ qt6-base-dev,
+ libkcolorpicker-qt6-dev,
+ qt6-tools-dev,
+ qt6-svg-dev,
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://github.com/ksnip/kImageAnnotator
 Vcs-Git: https://salsa.debian.org/debian/kimageannotator.git
 Vcs-Browser: https://salsa.debian.org/debian/kimageannotator
 
-Package: libkimageannotator-dev
+Package: libkimageannotator-qt6-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends:
- libkcolorpicker-dev,
- libkimageannotator0 (= ${binary:Version}),
+ libkcolorpicker-qt6-dev,
+ libkimageannotator-qt6-0 (= ${binary:Version}),
  ${misc:Depends},
 Description: Image Annotating Library (dev)
  The kImageAnnotator library provides tools to annotate
@@ -30,29 +29,14 @@ Description: Image Annotating Library (dev)
  .
  This package provides the development files.
 
-Package: libkimageannotator0
+Package: libkimageannotator0-qt6
 Architecture: any
 Multi-Arch: same
 Depends:
  ${shlibs:Depends},
- ${misc:Depends},
- libkimageannotator-common (= ${source:Version}),
+ ${misc:Depends}
 Description: Image Annotating Library (lib)
  The kImageAnnotator library provides tools to annotate
  images. This library is used by the ksnip project.
  .
  This package provides the shared library.
-
-Package: libkimageannotator-common
-Architecture: all
-Multi-Arch: foreign
-Depends:
- ${misc:Depends},
-Breaks: libkimageannotator0 (<< 0.3.1-3),
-Replaces: libkimageannotator0 (<< 0.3.1-3),
-Description: Image Annotating Library (common data files)
- The kImageAnnotator library provides tools to annotate
- images. This library is used by the ksnip project.
- .
- This package provides the architecture-independent files used by
- the library, including the translation files.
diff --git a/debian/rules b/debian/rules
index 7ccbeec..27787d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,10 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 # package maintainers to append LDFLAGS
 export DEB_LDFLAGS_MAINT_APPEND =
 
-export QT_SELECT := 5
-
-
 %:
-	dh $@
+	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-	    -DBUILD_SHARED_LIBS=ON
+	        -DBUILD_SHARED_LIBS=ON \
+	        -DBUILD_WITH_QT6=6