[neon/extras/kdevelop/Neon/unstable_jammy] debian: bring back plasma build deps, defaf and wrap&sort

Wed Jul 31 07:17:53 BST 2024

Git commit d0b901deddf02a9c938688ff6644e43dbf75b582 by Carlos De Maine.
Committed on 31/07/2024 at 06:17.
Pushed by carlosdem into branch 'Neon/unstable_jammy'.

bring back plasma build deps, defaf and wrap&sort

M  +16   -24   debian/control
D  +0    -14   debian/kdevelop-data.install
D  +0    -1    debian/kdevelop-l10n.install
M  +17   -2    debian/kdevelop.install
D  +0    -4    debian/kdevplatform515-libs.lintian-overrides
M  +6    -6    debian/plasma-kdevelop.install

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

diff --git a/debian/control b/debian/control
index 9eebfc0..94b2e5b 100644
--- a/debian/control
+++ b/debian/control
@@ -37,10 +37,12 @@ Build-Depends: clazy,
                kf6-syntax-highlighting-dev,
                kf6-krunner-dev [linux-any],
                kf6-kservice-dev,
-               libkomparediff2-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],
+               libkomparediff2-dev,
+               libksysguard-dev
+               libplasma-dev,
                libsvn-dev,
                llvm-14-dev (>= 1:3.8) [!alpha !hppa !hurd-any !ia64 !kfreebsd-any !m68k !powerpcspe !riscv64 !sh4 !x32],
                okteta-dev,
@@ -80,19 +82,6 @@ Description: integrated development environment for KDE
  KDevelop has parser backends for C, C++ and Javascript/QML, with further
  external plugins supporting e.g. PHP or Python.
 
-Package: kdevelop-data
-Architecture: all
-Depends: qml6-module-qtquick-controls,
-         qml6-module-qtquick,
-         ${misc:Depends}
-Description: data 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 arch independent data for KDevelop.
-
 Package: kdevelop-dev
 Section: libdevel
 Architecture: any
@@ -110,16 +99,19 @@ Description: development files for the KDevelop IDE
  .
  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
-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: kdevplatform-libs
 Architecture: any
@@ -127,7 +119,7 @@ Depends: qml6-module-qtquick-controls,
          qml6-module-qtquick,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: kdevplatform513-libs (<< ${source:Version}~ciBuild),
+Breaks: kdevplatform515-libs (<< ${source:Version}~ciBuild),
 Provides: qml6-module-org-kde-kdevplatform
 Suggests: cvs, git, kdevplatform-l10n, konsole, zsh
 Description: shared libraries for the KDevelop platform
@@ -165,4 +157,4 @@ Description: KDevelop plugins for Plasma
  desktop environment:
   * sessions data engine
   * sessions widget
-  * sessions KRunner module
\ No newline at end of file
+  * sessions KRunner module
diff --git a/debian/kdevelop-data.install b/debian/kdevelop-data.install
deleted file mode 100644
index b0f775c..0000000
--- a/debian/kdevelop-data.install
+++ /dev/null
@@ -1,14 +0,0 @@
-usr/share/bash-completion/completions/kdevelop
-usr/share/doc/
-usr/share/icons/
-usr/share/kdevappwizard/
-usr/share/kdevclangsupport/
-usr/share/kdevcodegen/
-usr/share/kdevcodeutils/
-usr/share/kdevelop/
-usr/share/kdevelop/
-usr/share/kdevfiletemplates/
-usr/share/kdevmanpage/
-usr/share/knotifications6/
-usr/share/knsrcfiles/
-usr/share/mime/
diff --git a/debian/kdevelop-l10n.install b/debian/kdevelop-l10n.install
deleted file mode 100644
index 2568e1f..0000000
--- a/debian/kdevelop-l10n.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/
diff --git a/debian/kdevelop.install b/debian/kdevelop.install
index 0925490..f0bb915 100644
--- a/debian/kdevelop.install
+++ b/debian/kdevelop.install
@@ -3,8 +3,23 @@ usr/bin/kdevelop*
 usr/lib/*/libKDevCMakeCommon.so.*
 usr/lib/*/libKDevClangPrivate.so.*
 usr/lib/*/libKDevCompileAnalyzerCommon.so.*
-usr/share/applications/*
+usr/share/applications/
+usr/share/bash-completion/completions/kdevelop
+usr/share/doc/
+usr/share/icons/
+usr/share/kdevappwizard/
+usr/share/kdevclangsupport/
+usr/share/kdevcodegen/
+usr/share/kdevcodeutils/
+usr/share/kdevelop/
+usr/share/kdevelop/
+usr/share/kdevfiletemplates/
 usr/share/kdevgdb/
 usr/share/kdevlldb/
-usr/share/metainfo/*
+usr/share/kdevmanpage/
+usr/share/knotifications6/
+usr/share/knsrcfiles/
+usr/share/locale/
+usr/share/metainfo/
+usr/share/mime/
 usr/share/qlogging-categories6/kdevelop.categories
diff --git a/debian/kdevplatform515-libs.lintian-overrides b/debian/kdevplatform515-libs.lintian-overrides
deleted file mode 100644
index 1fcab94..0000000
--- a/debian/kdevplatform515-libs.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-kdevplatform515-libs: custom-library-search-path RUNPATH /usr/lib/llvm-14/lib [usr/lib/*/qt5/plugins/kdevplatform/515/kdevclangsupport.so]
-kdevplatform515-libs: package-name-doesnt-match-sonames libKDevPlatformDebugger515 libKDevPlatformDocumentation515 libKDevPlatformInterfaces515 libKDevPlatformLanguage515 libKDevPlatformOutputView515 libKDevPlatformProject515 libKDevPlatformSerialization515 libKDevPlatformShell515 libKDevPlatformSublime515 libKDevPlatformUtil515 libKDevPlatformVcs515
-kdevplatform515-libs: script-with-language-extension usr/bin/kdevplatform_shell_environment.sh
-kdevplatform515-libs: shell-script-fails-syntax-check usr/bin/kdevplatform_shell_environment.sh
diff --git a/debian/plasma-kdevelop.install b/debian/plasma-kdevelop.install
index 997205e..618081f 100644
--- a/debian/plasma-kdevelop.install
+++ b/debian/plasma-kdevelop.install
@@ -1,6 +1,6 @@
-#usr/lib/*/qt6/qml/org/kde/plasma/
-#usr/lib/*/libKDevelopSessionsWatch.so
-#usr/lib/*/qt5/plugins/kf5/krunner/krunner_kdevelopsessions.so
-#usr/lib/*/qt5/qml/org/kde/plasma/
-#usr/share/kservices5/plasma-applet-kdevelopsessions.desktop
-#usr/share/plasma/
\ No newline at end of file
+usr/lib/*/qt6/qml/org/kde/plasma/
+usr/lib/*/libKDevelopSessionsWatch.so
+usr/lib/*/qt6/plugins/kf6/krunner/krunner_kdevelopsessions.so
+usr/lib/*/qt6/qml/org/kde/plasma/
+usr/share/kservices6/plasma-applet-kdevelopsessions.desktop
+usr/share/plasma/
