[neon/neon-packaging/ksanecore/Neon/unstable] debian: ksanecore is qt6

[Carlos De Maine]

Git commit 155968182eed753d6053f8e4070a220bc444aae2 by Carlos De Maine.
Committed on 16/01/2024 at 02:08.
Pushed by carlosdem into branch 'Neon/unstable'.

ksanecore is qt6

D  +0    -1    debian/.gitattributes
M  +2    -1    debian/changelog
M  +30   -13   debian/control
M  +1    -1    debian/libksanecore-dev.install
A  +3    -0    debian/libksanecore.install
A  +1    -0    debian/libksanecore.lintian-overrides
D  +0    -3    debian/libksanecore1.install
M  +3    -3    debian/rules

https://invent.kde.org/neon/neon-packaging/ksanecore/-/commit/155968182eed753d6053f8e4070a220bc444aae2

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index bf67393..a44a7c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,5 @@
-ksanecore (23.08.4-0neon) jammy; urgency=medium
+
+ksanecore6 (23.08.4-0neon) jammy; urgency=medium
 
   * New release
 
diff --git a/debian/control b/debian/control
index c25537e..3419fb2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,31 +2,48 @@ Source: ksanecore
 Section: libs
 Priority: optional
 Maintainer: Jonathan Esk-Riddell <jr at jriddell.org>
-Build-Depends: cmake (>= 3.16.0~),
+Build-Depends: cmake,
                debhelper-compat (= 13),
-               extra-cmake-modules (>= 5.90.0~),
-               libkf5i18n-dev (>= 5.90.0~),
+               kf6-extra-cmake-modules,
+               kf6-ki18n-dev,
                libsane-dev,
                libx11-dev,
-               pkg-kde-tools,
-               qtbase5-dev (>= 5.15.2~),
-Standards-Version: 4.6.0
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+Standards-Version: 4.6.2
 Homepage: https://invent.kde.org/libraries/ksanecore
 Rules-Requires-Root: no
 
+
+Package: libksanecore
+Architecture: any
+Provides: libksanecore6-1
+Replaces: libksanecore6-1
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Library providing logic to interface scanners
+ Library providing logic to interface scanners - shared library
+
 Package: libksanecore-dev
 Section: libdevel
 Architecture: any
-Depends: libksanecore1 (= ${binary:Version}),
-         qtbase5-dev (>= 5.15.2~),
+Provides: libksanecore6-dev
+Replaces: libksanecore6-dev
+Depends: libksanecore (= ${binary:Version}),
+         qt6-base-dev,
          ${misc:Depends},
 Description: Library providing logic to interface scanners - headers
  Library providing logic to interface scanners.
  .
  This package contains the scanner library development files.
 
-Package: libksanecore1
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Library providing logic to interface scanners
- Library providing logic to interface scanners - shared library
+Package: libksanecore6-1
+Architecture: all
+Depends: libksanecore, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libksanecore6-dev
+Architecture: all
+Depends: libksanecore-dev, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/libksanecore-dev.install b/debian/libksanecore-dev.install
index 12d0135..2df8cbc 100644
--- a/debian/libksanecore-dev.install
+++ b/debian/libksanecore-dev.install
@@ -1,3 +1,3 @@
 /usr/include/
 /usr/lib/*/cmake/
-/usr/lib/*/libKSaneCore.so
+/usr/lib/*/libKSaneCore6.so
diff --git a/debian/libksanecore.install b/debian/libksanecore.install
new file mode 100644
index 0000000..c5ade85
--- /dev/null
+++ b/debian/libksanecore.install
@@ -0,0 +1,3 @@
+/usr/lib/*/libKSaneCore6.so.1
+/usr/lib/*/libKSaneCore6.so.2*
+/usr/share/locale/
diff --git a/debian/libksanecore.lintian-overrides b/debian/libksanecore.lintian-overrides
new file mode 100644
index 0000000..c02802d
--- /dev/null
+++ b/debian/libksanecore.lintian-overrides
@@ -0,0 +1 @@
+libksanecore: package-name-doesnt-match-sonames libKSaneCore6-1
diff --git a/debian/libksanecore1.install b/debian/libksanecore1.install
deleted file mode 100644
index fc52b69..0000000
--- a/debian/libksanecore1.install
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/lib/*/libKSaneCore.so.1
-/usr/lib/*/libKSaneCore.so.2*
-/usr/share/locale/
diff --git a/debian/rules b/debian/rules
index 38fa690..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5
+	dh $@ --with kf6 --buildsystem kf6