[neon/kde/kate/Neon/unstable] debian: Revert "Revert "Port to QT6""

[Carlos De Maine]

Git commit f172d6b9ee4f21e2f38f65dbda2edee1e193ea7b by Carlos De Maine.
Committed on 28/07/2023 at 01:08.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "Revert "Port to QT6""

This reverts commit 7064646d0a6bce57cb6ffaeeb2022f9f7158f644.

M  +31   -30   debian/control
M  +1    -1    debian/kate.install
R  +0    -2    debian/kate6-data.install [from: debian/kate5-data.install - 089% similarity]
R  +0    -0    debian/kate6-data.maintscript [from: debian/kate5-data.maintscript - 100% similarity]
M  +3    -0    debian/rules

https://invent.kde.org/neon/kde/kate/-/commit/f172d6b9ee4f21e2f38f65dbda2edee1e193ea7b

diff --git a/debian/control b/debian/control
index e90fbc1..c762338 100644
--- a/debian/control
+++ b/debian/control
@@ -7,34 +7,34 @@ Uploaders: Modestas Vainius <modax at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12),
                debhelper (>= 11~),
-               extra-cmake-modules (>= 1.3.0~),
-               kinit-dev (>= 5.6.0~),
-               kuserfeedback-dev,
-               libkf5activities-dev (>= 5.13.0~),
-               libkf5config-dev (>= 5.13.0~),
-               libkf5crash-dev (>= 5.13.0~),
-               libkf5dbusaddons-dev,
-               libkf5doctools-dev (>= 5.10.0~),
-               libkf5guiaddons-dev (>= 5.6.0~),
-               libkf5i18n-dev (>= 5.13.0~),
-               libkf5iconthemes-dev (>= 5.13.0~),
-               libkf5itemmodels-dev,
-               libkf5jobwidgets-dev (>= 5.13.0~),
-               libkf5kio-dev (>= 5.13.0~),
-               libkf5newstuff-dev,
-               libkf5parts-dev (>= 5.13.0~),
-               libkf5plasma-dev,
-               libkf5pty-dev,
-               libkf5syntaxhighlighting-dev,
-               libkf5texteditor-dev (>= 5.13.0~),
-               libkf5threadweaver-dev,
-               libkf5wallet-dev,
-               libkf5windowsystem-dev (>= 5.13.0~),
-               libkf5xmlgui-dev (>= 5.13.0~),
-               libqt5x11extras5-dev,
+               kf6-extra-cmake-modules,
+               kf6-kactivities-dev,
+               kf6-kconfig-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdoctools-dev,
+               kf6-kguiaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kitemmodels-dev,
+               kf6-kjobwidgets-dev,
+               kf6-kio-dev,
+               kf6-knewstuff-dev,
+               kf6-kparts-dev,
+               kf6-plasma-framework-dev,
+               kf6-kpty-dev,
+               kf6-syntax-highlighting-dev,
+               kf6-ktexteditor-dev,
+               kf6-threadweaver-dev,
+               kf6-kwallet-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               kf6-kcolorscheme-dev,
+               kf6-kuserfeedback-dev,
+               kf6-kmoretools-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.15.15ubuntu1~),
-               qtbase5-dev (>= 5.4.0~)
+               pkg-kde-tools-neon,
+               qt6-base-dev
 Standards-Version: 4.2.1
 Homepage: http://kate-editor.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kate
@@ -43,7 +43,7 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kate.git
 Package: kate
 Section: editors
 Architecture: any
-Depends: kate5-data (>= ${source:Version}),
+Depends: kate6-data (>= ${source:Version}),
          ktexteditor-katepart,
          plasma-framework,
          qml-module-org-kde-kquickcontrolsaddons,
@@ -74,13 +74,14 @@ Description: powerful text editor
   * Symbol viewers for C, C++, and Python
   * XML completion and validation
 
-Package: kate5-data
+Package: kate6-data
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: kate (<< 4:19.04.0),
           kate-data (<< 4:4.14.3-0ubuntu4),
+          kate5-data,
           ${kde-l10n:all}
-Breaks: kate (<< 4:19.04.0), kate-data (<< 4:4.14.3-0ubuntu4), ${kde-l10n:all}
+Breaks: kate (<< 4:19.04.0), kate-data (<< 4:4.14.3-0ubuntu4), kate5-data, ${kde-l10n:all}
 Description: shared data files for Kate text editor
  This package contains the architecture-independent shared data files needed
  for Kate editor
diff --git a/debian/kate.install b/debian/kate.install
index a4c0f3e..a38f3ee 100644
--- a/debian/kate.install
+++ b/debian/kate.install
@@ -1,5 +1,5 @@
 usr/bin/kate
 usr/lib/*/libkateprivate.so.2*
-usr/lib/*/qt5/plugins/ktexteditor/
+usr/lib/*/qt6/plugins/
 usr/share/applications/org.kde.kate.desktop
 usr/share/metainfo/org.kde.kate.appdata.xml
diff --git a/debian/kate5-data.install b/debian/kate6-data.install
similarity index 89%
rename from debian/kate5-data.install
rename to debian/kate6-data.install
index faff0e3..d97d0bb 100644
--- a/debian/kate5-data.install
+++ b/debian/kate6-data.install
@@ -8,6 +8,4 @@ usr/share/locale/*/LC_MESSAGES/*kate*.mo
 usr/share/locale/*/LC_MESSAGES/ktexteditorpreviewplugin.mo
 usr/share/locale/*/LC_MESSAGES/lspclient.mo
 usr/share/locale/*/LC_MESSAGES/tabswitcherplugin.mo
-usr/share/man/*/man1/kate.1
 usr/share/man/man1/kate.1
-usr/share/kconf_update/
diff --git a/debian/kate5-data.maintscript b/debian/kate6-data.maintscript
similarity index 100%
rename from debian/kate5-data.maintscript
rename to debian/kate6-data.maintscript
diff --git a/debian/rules b/debian/rules
index 24de128..46804bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,12 @@
 
 l10npkgs_firstversion_ok := 4:16.04.3-6~
 
+
 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,pkgkde-symbolshelper
+
 override_dh_auto_test:
 	# Disable dh_auto_test at build time
 	: