[neon/extras/kdevelop/Neon/release] debian: Merge branch 'Neon/release_jammy' into Neon/release

[Jonathan Riddell]

Git commit 74a02759a7673ea8f0ac764deb119f13c8818251 by Jonathan Riddell.
Committed on 22/08/2024 at 15:28.
Pushed by jriddell into branch 'Neon/release'.

Merge branch 'Neon/release_jammy' into Neon/release

M  +0    -7    debian/changelog
M  +56   -43   debian/control

https://invent.kde.org/neon/extras/kdevelop/-/commit/74a02759a7673ea8f0ac764deb119f13c8818251

diff --cc debian/control
index c1cb09f,8da8625..1467331
--- a/debian/control
+++ b/debian/control
@@@ -9,49 -9,49 +9,73 @@@ Build-Depends: clazy
                 cmake,
                 cppcheck,
                 debhelper-compat (= 13),
-                extra-cmake-modules,
                 heaptrack-gui,
                 kdevelop-pg-qt,
+                kf6-extra-cmake-modules,
+                kf6-kcmutils-dev,
+                kf6-kcolorscheme-dev,
+                kf6-kconfig-dev,
+                kf6-kcrash-dev,
+                kf6-kdeclarative-dev,
+                kf6-kdoctools-dev,
+                kf6-ki18n-dev,
+                kf6-kiconthemes-dev,
+                kf6-kio-dev,
+                kf6-kitemmodels-dev,
+                kf6-kitemviews-dev,
+                kf6-kjobwidgets-dev,
+                kf6-knewstuff-dev,
+                kf6-knotifications-dev,
+                kf6-knotifyconfig-dev,
+                kf6-kparts-dev,
+                kf6-ktexteditor-dev,
+                kf6-ktexttemplate-dev,
+                kf6-threadweaver-dev,
+                kf6-kwindowsystem-dev,
+                kf6-kxmlgui-dev,
+                kf6-purpose-dev,
+                kf6-syntax-highlighting-dev,
+                kf6-krunner-dev [linux-any],
+                kf6-kservice-dev,
                 libastyle-dev,
                 libboost-dev (>= 1.35.0),
 -               libclang-14-dev (>= 1:3.8) [!alpha !hppa !hurd-any !ia64 !kfreebsd-any !m68k !powerpcspe !riscv64 !sh4 !x32],
 +               libclang-dev (>= 1:3.8) [!alpha !hppa !hurd-any !ia64 !kfreebsd-any !m68k !powerpcspe !riscv64 !sh4 !x32],
 +               libgrantlee5-dev,
 +               libkf5config-dev,
 +               libkf5crash-dev,
 +               libkf5declarative-dev,
 +               libkf5doctools-dev,
 +               libkf5i18n-dev,
 +               libkf5iconthemes-dev,
 +               libkf5itemmodels-dev,
 +               libkf5itemviews-dev,
 +               libkf5jobwidgets-dev,
 +               libkf5kcmutils-dev,
 +               libkf5kio-dev,
 +               libkf5newstuff-dev,
 +               libkf5notifyconfig-dev,
 +               libkf5parts-dev,
 +#               libkf5plasma-dev,
 +               libkf5purpose-dev,
 +#               libkf5runner-dev [linux-any],
 +               libkf5service-dev,
 +               libkf5syntaxhighlighting-dev,
 +#               libkf5sysguard-dev,
 +               libkf5texteditor-dev,
 +               libkf5threadweaver-dev,
 +               libkf5windowsystem-dev,
 +               libkf5xmlgui-dev,
                 libkomparediff2-dev,
 -               libksysguard-dev
 -               libplasma-dev,
 +               libqt5webkit5-dev,
                 libsvn-dev,
 -               llvm-14-dev (>= 1:3.8) [!alpha !hppa !hurd-any !ia64 !kfreebsd-any !m68k !powerpcspe !riscv64 !sh4 !x32],
 +               llvm-dev (>= 1:3.8) [!alpha !hppa !hurd-any !ia64 !kfreebsd-any !m68k !powerpcspe !riscv64 !sh4 !x32],
                 okteta-dev,
-                pkg-kde-tools (>> 0.15.15),
-                qtbase5-dev,
-                qtdeclarative5-dev,
-                qttools5-dev,
-                qttools5-dev-tools,
-                qtwebengine5-dev,
-                shared-mime-info
+                pkg-kde-tools-neon,
+                qt6-base-dev,
+                qt6-declarative-dev,
+                qt6-tools-dev,
+                qt6-webengine-dev,
+                shared-mime-info,
  Standards-Version: 4.6.2
  Homepage: http://www.kdevelop.org/
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/kde-std/kdevelop.git
@@@ -63,13 -63,10 +87,14 @@@ Depends: clang-tidy
           clazy,
           cppcheck,
           heaptrack-gui,
 +         kdevelop-data (>= ${source:Version}),
 +         kdevelop-l10n,
 +         libclang-dev,
 +         libqt5webengine5,
           meson,
-          qml-module-qtquick-controls,
-          qml-module-qtquick2,
+          qml6-module-qtquick-controls,
+          qml6-module-qtquick,
+          qt6-webengine,
           ${misc:Depends},
           ${shlibs:Depends}
  Recommends: g++, gcc, gdb (>= 7.0), kapptemplate, make, plasma-kdevelop
@@@ -111,34 -96,29 +125,36 @@@ Description: development files for the 
   .
   This package contains development files for KDevelop.
  
+ Package: kdevelop-data
+ Architecture: all
+ Section: oldlibs
+ Depends: kdevelop, ${misc:Depends}
+ Description: Dummy transitional package.
+  This is a dummy transitional and can be safely deleted.
+ 
  Package: kdevelop-l10n
- Section: localization
  Architecture: all
- Depends: ${misc:Depends}
- Description: localization files for the KDevelop IDE
-  KDevelop is a Free and Open Source integrated development
-  environment (IDE). It provides editing, navigation and debugging features for
-  several programming languages, as well as integration with multiple build
-  systems and version-control systems, using a plugin-based architecture.
-  .
-  This package contains the translations for KDevelop.
+ Section: oldlibs
+ Depends: kdevelop, ${misc:Depends}
+ Description: Dummy transitional package.
+  This is a dummy transitional and can be safely deleted.
  
- Package: kdevplatform514-libs
+ Package: kdevplatform-libs
  Architecture: any
- Depends: qml-module-qtquick-controls,
-          qml-module-qtquick2,
+ Depends: qml6-module-qtquick-controls,
+          qml6-module-qtquick,
           ${misc:Depends},
           ${shlibs:Depends}
 -Breaks: kdevplatform515-libs (<< 4:24.08.0), kdevplatform514-libs (<< 4:24.08.0)
 -Provides: qml6-module-org-kde-kdevplatform
 -Suggests: cvs, git, kdevplatform-l10n, konsole, zsh
 +Replaces: kdevplatform510-libs,
 +          kdevplatform511-libs,
 +          kdevplatform512-libs,
 +          kdevplatform513-libs,
 +Breaks: kdevplatform510-libs,
 +        kdevplatform511-libs,
 +        kdevplatform512-libs,
 +        kdevplatform513-libs,
 +Provides: qml-module-org-kde-kdevplatform
 +Suggests: cvs, git, konsole, zsh
  Description: shared libraries for the KDevelop platform
   This package contains shared libraries needed to run integrated development
   environments based on the KDevelop platform.