[neon/kde/kcolorchooser/Neon/unstable] debian: merge Neon/experimental into Neon/unstable

[Carlos De Maine]

Git commit e038a07cb99122df75f4328d7903a605290bd625 by Carlos De Maine.
Committed on 15/09/2023 at 07:12.
Pushed by carlosdem into branch 'Neon/unstable'.

merge Neon/experimental into Neon/unstable

D  +0    -1    debian/compat
M  +11   -11   debian/control
M  +4    -4    debian/rules

https://invent.kde.org/neon/kde/kcolorchooser/-/commit/e038a07cb99122df75f4328d7903a605290bd625

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index ee5d840..3e5a466 100644
--- a/debian/control
+++ b/debian/control
@@ -5,15 +5,17 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Eshat Cakar <info at eshat.de>,
            Sune Vuorela <sune at debian.org>,
            Maximiliano Curia <maxy at debian.org>,
-Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 11),
-               extra-cmake-modules (>= 1.7.0~),
-               libkf5i18n-dev,
-               libkf5widgetsaddons-dev,
-               libkf5xmlgui-dev,
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.2.0~),
-Standards-Version: 4.1.4
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               kf6-kcolorscheme-dev,
+               kf6-kconfig-dev,
+               kf6-ki18n-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kxmlgui-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+Standards-Version: 4.6.2
 Homepage: https://projects.kde.org/projects/kde/kdegraphics/kcolorchooser
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kcolorchooser
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kcolorchooser.git
@@ -22,8 +24,6 @@ Package: kcolorchooser
 Section: graphics
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: ${kde-l10n:all}
-Breaks: ${kde-l10n:all}
 Description: color chooser and palette editor
  KColorChooser is a color palette tool, used to mix colors and create custom
  color palettes.  Using the dropper, it can obtain the color of any pixel on
diff --git a/debian/rules b/debian/rules
index 7313945..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-l10npkgs_firstversion_ok := 4:16.04.3-5~
-
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
+%:
+	dh $@ --with kf6 --buildsystem kf6