[neon/kde/umbrello/Neon/unstable_jammy] debian: Revert "kf5 revert"

[Jonathan Riddell]

Git commit 6121ffe5a68aaba9426763ff138fcdaac8c2def4 by Jonathan Riddell.
Committed on 22/08/2024 at 16:27.
Pushed by jriddell into branch 'Neon/unstable_jammy'.

Revert "kf5 revert"

This reverts commit e1f1675e68f3aafe1253266740f2ea1c88b214f8.

M  +1    -1    debian/changelog
M  +31   -36   debian/control
M  +4    -17   debian/rules
M  +3    -3    debian/umbrello.lintian-overrides

https://invent.kde.org/neon/kde/umbrello/-/commit/6121ffe5a68aaba9426763ff138fcdaac8c2def4

diff --git a/debian/changelog b/debian/changelog
index b41d7d0..2175430 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-umbrello (4:24.05.2-0neon) jammy; urgency=medium
+umbrello (4:24.08.0-0neon) jammy; urgency=medium
 
   * New release
 
diff --git a/debian/control b/debian/control
index 5f924d8..8b2ae3b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,45 +6,42 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Modestas Vainius <modax at debian.org>,
            George Kiagiadakis <kiagiadakis.george at gmail.com>,
            Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 9),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                doxygen,
-               extra-cmake-modules (>= 1.1.0~),
                kdevelop-pg-qt,
                kdevplatform-dev,
-               kinit-dev,
-               libboost-dev (>= 1.33.1),
-               libclang-14-dev,
-               libgrantlee5-dev,
-               libkf5archive-dev,
-               libkf5auth-dev,
-               libkf5completion-dev,
-               libkf5config-dev,
-               libkf5coreaddons-dev,
-               libkf5crash-dev,
-               libkf5doctools-dev,
-               libkf5guiaddons-dev,
-               libkf5i18n-dev,
-               libkf5iconthemes-dev,
-               libkf5kdelibs4support-dev,
-               libkf5kio-dev,
-               libkf5parts-dev,
-               libkf5service-dev,
-               libkf5syntaxhighlighting-dev,
-               libkf5texteditor-dev,
-               libkf5widgetsaddons-dev,
-               libkf5windowsystem-dev,
-               libkf5xmlgui-dev,
-               libqt5svg5-dev (>= 5.2.0~),
-               libqt5webkit5-dev (>= 5.2.0~),
+               kf6-extra-cmake-modules,
+               kf6-karchive-dev,
+               kf6-kauth-dev,
+               kf6-kcompletion-dev,
+               kf6-kconfig-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-kdoctools-dev,
+               kf6-kguiaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kio-dev,
+               kf6-kparts-dev,
+               kf6-kservice-dev,
+               kf6-ktexteditor-dev,
+               kf6-ktexttemplate-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               kf6-syntax-highlighting-dev,
+               libboost-dev,
+               libclang-dev,
                libxml2-dev,
                libxslt1-dev,
                llvm-13-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.12),
-               qhelpgenerator-qt5,
-               qtbase5-dev (>= 5.2.0~)
-Standards-Version: 4.1.1
+               pkg-kde-tools-neon,
+               qtbase5-dev,
+               qt6-svg-dev,
+               qt6-tools-dev
+Standards-Version: 4.6.2
 Homepage: http://www.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/umbrello.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/umbrello.git
@@ -52,14 +49,12 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/umbrello.git
 Package: umbrello
 Architecture: any
 Section: devel
-Depends: kinit, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: khelpcenter
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
 Description: UML modelling tool and code generator
  Umbrello UML Modeller is a Unified Modelling Language diagram editor for KDE.
  It can create diagrams of software and other systems in the industry-standard
  UML format, and can also generate code from UML diagrams in a variety of
  programming languages.
  .
- This package is part of the KDE Software Development Kit module.
+ This package is part of the KDE Software Development Kit module.
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 3758d93..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +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-3~
-
-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
-
-export QT_SELECT=qt5
-
-override_dh_auto_configure:
-	$(overridden_command) -- -DBUILD_KF5=ON
-
-override_dh_auto_build:
-	$(overridden_command)
-	cd obj-*; make apidoc; cd -
-
-override_dh_auto_test:
-	# Disable dh_auto_test at build time
-	:
+%:
+	dh $@ --with kf6 --buildsystem kf6
diff --git a/debian/umbrello.lintian-overrides b/debian/umbrello.lintian-overrides
index 9dbf8a1..b8a09bc 100644
--- a/debian/umbrello.lintian-overrides
+++ b/debian/umbrello.lintian-overrides
@@ -1,3 +1,3 @@
-umbrello: binary-without-manpage usr/bin/po2xmi5
-umbrello: binary-without-manpage usr/bin/xmi2pot5
-umbrello: script-not-executable usr/share/umbrello5/headings/heading.rb
+umbrello: binary-without-manpage usr/bin/po2xmi6
+umbrello: binary-without-manpage usr/bin/xmi2pot6
+umbrello: script-not-executable usr/share/umbrello6/headings/heading.rb