[neon/extras/kdevelop/Neon/experimental] debian: (re)kf6ify

Carlos De Maine null at kde.org
Thu Oct 26 07:31:38 BST 2023


Git commit 0c3ede36eb775a65451670b9083ab83ef0dec17e by Carlos De Maine.
Committed on 26/10/2023 at 08:31.
Pushed by carlosdem into branch 'Neon/experimental'.

(re)kf6ify

M  +0    -6    debian/changelog
M  +57   -167  debian/control
M  +2    -2    debian/kdevelop-data.install
M  +1    -1    debian/kdevelop.install
A  +28   -0    debian/kdevplatform-libs.install
A  +3    -0    debian/kdevplatform-libs.lintian-overrides
M  +3    -3    debian/plasma-kdevelop.install
M  +9    -1    debian/rules

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

diff --git a/debian/changelog b/debian/changelog
index e2da48a..298e7f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-kdevelop (4:23.08.2-0neon) jammy; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Wed, 11 Oct 2023 17:03:16 +0000
-
 kdevelop (4:23.08.1-0neon) jammy; urgency=medium
 
   * New release
diff --git a/debian/control b/debian/control
index a5cb921..20d197f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,49 +9,47 @@ 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-knotifyconfig-dev,
+               kf6-kparts-dev,
+               kf6-plasma-framework-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,
+#               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],
-               libgrantlee5-dev,
-               libkf5config-dev (>= 5.15.0),
-               libkf5crash-dev (>= 5.15.0),
-               libkf5declarative-dev (>= 5.15.0),
-               libkf5doctools-dev (>= 5.15.0),
-               libkf5i18n-dev (>= 5.15.0),
-               libkf5iconthemes-dev,
-               libkf5itemmodels-dev (>= 5.15.0),
-               libkf5itemviews-dev (>= 5.15.0),
-               libkf5jobwidgets-dev (>= 5.15.0),
-               libkf5kcmutils-dev (>= 5.15.0),
-               libkf5kio-dev (>= 5.15.0),
-               libkf5newstuff-dev (>= 5.15.0),
-               libkf5notifyconfig-dev (>= 5.15.0),
-               libkf5parts-dev (>= 5.15.0),
-               libkf5plasma-dev,
-               libkf5purpose-dev,
-               libkf5runner-dev [linux-any],
-               libkf5service-dev (>= 5.15.0),
-               libkf5syntaxhighlighting-dev,
-#               libkf5sysguard-dev,
-               libkf5texteditor-dev (>= 5.15.0),
-               libkf5threadweaver-dev (>= 5.15.0),
-               libkf5windowsystem-dev (>= 5.15.0),
-               libkf5xmlgui-dev (>= 5.15.0),
-               libkomparediff2-dev,
-               libqt5webkit5-dev (>= 5.4.0),
                libsvn-dev,
                llvm-14-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
+#               okteta-dev,
+               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
@@ -65,18 +63,16 @@ Depends: clang-tidy-14,
          heaptrack-gui,
          kdevelop-data (>= ${source:Version}),
          kdevelop-l10n,
+         kf6-plasma-framework,
          libclang-common-14-dev,
-         libqt5webengine5,
          meson,
-         plasma-framework,
-         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
 Suggests: cmake, cppcheck, heaptrack, kdevelop-l10n, ninja-build
-Replaces: kdevplatform10-libs (<< 5.1.1-0neon)
-Breaks: kdevplatform10-libs (<< 5.1.1-0neon)
 Description: integrated development environment for KDE
  KDevelop is an easy to use integrated development environment for KDE.
  It supports a wide range of programming languages and features project
@@ -87,24 +83,10 @@ Description: integrated development environment for KDE
 
 Package: kdevelop-data
 Architecture: all
-Depends: plasma-framework,
-         qml-module-qtquick-controls,
-         qml-module-qtquick2,
+Depends: kf6-plasma-framework,
+         qml6-module-qtquick-controls,
+         qml6-module-qtquick2,
          ${misc:Depends}
-Breaks: kdevelop-doc (<< 4:4.3),
-        kdevplatform10-libs (<< 5.1.1-0neon),
-        kdevplatform52-libs (<< 5.2),
-        kdevplatform53-libs (<< 4:21.12.1),
-        kdevplatform54-libs (<< 4:21.12.1),
-        kdevplatform55-libs (<< 4:21.12.1),
-        kdevplatform56-libs (<< 4:21.12.1)
-Replaces: kdevelop-doc (<< 4:4.3),
-          kdevplatform10-libs (<< 5.1.1-0neon),
-          kdevplatform52-libs (<< 5.2),
-          kdevplatform53-libs (<< 4:21.12.1),
-          kdevplatform54-libs (<< 4:21.12.1),
-          kdevplatform55-libs (<< 4:21.12.1),
-          kdevplatform56-libs (<< 4:21.12.1)
 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
@@ -118,13 +100,10 @@ Section: libdevel
 Architecture: any
 Depends: kdevelop (= ${binary:Version}),
          kdevplatform-dev,
-         libkf5archive-dev,
-         libkf5configwidgets-dev,
-         libkf5texteditor-dev,
-         libkf5syntaxhighlighting-dev
+         kf6-karchive-dev,
+         kf6-kconfigwidgets-dev,
+         kf6-ktexteditor-dev,
          ${misc:Depends}
-Replaces: kdevplatform-dev (<< 5.1.1-0neon)
-Breaks: kdevplatform-dev (<< 5.1.1-0neon)
 Description: development files for the KDevelop IDE
  KDevelop is a Free and Open Source integrated development
  environment (IDE). It provides editing, navigation and debugging features for
@@ -136,54 +115,6 @@ Description: development files for the KDevelop IDE
 Package: kdevelop-l10n
 Section: localization
 Architecture: all
-Replaces: kdevelop-l10n-ca,
-          kdevelop-l10n-cavalencia,
-          kdevelop-l10n-da,
-          kdevelop-l10n-de,
-          kdevelop-l10n-engb,
-          kdevelop-l10n-es,
-          kdevelop-l10n-et,
-          kdevelop-l10n-fi,
-          kdevelop-l10n-fr,
-          kdevelop-l10n-gl,
-          kdevelop-l10n-it,
-          kdevelop-l10n-nds,
-          kdevelop-l10n-nl,
-          kdevelop-l10n-pt,
-          kdevelop-l10n-ptbr,
-          kdevelop-l10n-ru,
-          kdevelop-l10n-sl,
-          kdevelop-l10n-sv,
-          kdevelop-l10n-th,
-          kdevelop-l10n-tr,
-          kdevelop-l10n-uk,
-          kdevelop-l10n-zhcn,
-          kdevelop-l10n-zhtw,
-          kdevplatform-l10n (<< 5.2.0)
-Breaks: kdevelop-l10n-ca,
-        kdevelop-l10n-cavalencia,
-        kdevelop-l10n-da,
-        kdevelop-l10n-de,
-        kdevelop-l10n-engb,
-        kdevelop-l10n-es,
-        kdevelop-l10n-et,
-        kdevelop-l10n-fi,
-        kdevelop-l10n-fr,
-        kdevelop-l10n-gl,
-        kdevelop-l10n-it,
-        kdevelop-l10n-nds,
-        kdevelop-l10n-nl,
-        kdevelop-l10n-pt,
-        kdevelop-l10n-ptbr,
-        kdevelop-l10n-ru,
-        kdevelop-l10n-sl,
-        kdevelop-l10n-sv,
-        kdevelop-l10n-th,
-        kdevelop-l10n-tr,
-        kdevelop-l10n-uk,
-        kdevelop-l10n-zhcn,
-        kdevelop-l10n-zhtw,
-        kdevplatform-l10n (<< 5.2.0)
 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
@@ -192,53 +123,16 @@ Description: localization files for the KDevelop IDE
  .
  This package contains the translations for KDevelop.
 
-Package: kdevplatform513-libs
+Package: kdevplatform-libs
 Architecture: any
-Depends: plasma-framework,
-         qml-module-qtquick-controls,
-         qml-module-qtquick2,
+Depends: kf6-plasma-framework,
+         qml6-module-qtquick-controls,
+         qml6-module-qtquick,
          ${misc:Depends},
          ${shlibs:Depends}
-Replaces: kdevelop (<< 4:3.9.96-1),
-          kdevelop-data (<< 4:3.9.96-1),
-          kdevplatform1-libs,
-          kdevplatform10-libs (<< 5.2.0),
-          kdevplatform2-libs,
-          kdevplatform3-libs,
-          kdevplatform5-libs,
-          kdevplatform510-libs,
-          kdevplatform511-libs,
-          kdevplatform512-libs,
-          kdevplatform52-libs (<< 5.2.0),
-          kdevplatform53-libs (<< 4:21.12.1),
-          kdevplatform54-libs (<< 4:21.12.1),
-          kdevplatform55-libs (<< 4:21.12.1),
-          kdevplatform56-libs (<< 4:21.12.1),
-          kdevplatform57-libs (<< 4:22.04),
-          kdevplatform58-libs (<< 4:22.08),
-          kdevplatform59-libs,
-          kdevplatform7-libs,
-          kdevplatform8-libs,
-          kdevplatform9-libs
-Breaks: kdevplatform1-libs,
-        kdevplatform10-libs (<< 5.2.0),
-        kdevplatform2-libs,
-        kdevplatform3-libs,
-        kdevplatform5-libs,
-        kdevplatform510-libs,
-        kdevplatform511-libs,
-        kdevplatform52-libs (<< 5.2.0),
-        kdevplatform53-libs (<< 4:21.12.1),
-        kdevplatform54-libs (<< 4:21.12.1),
-        kdevplatform55-libs (<< 4:21.12.1),
-        kdevplatform56-libs (<< 4:21.12.1),
-        kdevplatform57-libs (<< 4:22.04),
-        kdevplatform58-libs (<< 4:22.08),
-        kdevplatform59-libs,
-        kdevplatform7-libs,
-        kdevplatform8-libs,
-        kdevplatform9-libs
-Provides: qml-module-org-kde-kdevplatform
+Replaces: kdevplatform513-libs,
+Breaks: kdevplatform513-libs,
+Provides: qml6-module-org-kde-kdevplatform
 Suggests: cvs, git, kdevplatform-l10n, konsole, zsh
 Description: shared libraries for the KDevelop platform
  This package contains shared libraries needed to run integrated development
@@ -249,15 +143,13 @@ Description: shared libraries for the KDevelop platform
 Package: kdevplatform-dev
 Section: libdevel
 Architecture: any
-Depends: kdevplatform513-libs (= ${binary:Version}),
-         libkf5archive-dev,
-         libkf5texteditor-dev,
-         libkf5threadweaver-dev,
-         qtbase5-dev,
-         qtdeclarative5-dev,
+Depends: kdevplatform-libs (= ${binary:Version}),
+         kf6-karchive-dev,
+         kf6-ktexteditor-dev,
+         kf6-threadweaver-dev,
+         qt6-base-dev,
+         qt6-declarative-dev,
          ${misc:Depends}
-Breaks: libsublime-dev
-Replaces: libsublime-dev
 Description: development files for the KDevelop platform
  This package contains development files for building integrated development
  environments based on the KDevelop platform.
@@ -267,8 +159,6 @@ Description: development files for the KDevelop platform
 Package: plasma-kdevelop
 Architecture: linux-any
 Depends: kdevelop (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Replaces: kdevelop (<< 4:5.6.2), kdevelop-data (<< 4:5.6.2)
-Breaks: kdevelop (<< 4:5.6.2), kdevelop-data (<< 4:5.6.2)
 Description: KDevelop plugins for Plasma
  KDevelop is a Free and Open Source integrated development
  environment (IDE). It provides editing, navigation and debugging features for
diff --git a/debian/kdevelop-data.install b/debian/kdevelop-data.install
index 539114f..5bfa354 100644
--- a/debian/kdevelop-data.install
+++ b/debian/kdevelop-data.install
@@ -10,7 +10,7 @@ usr/share/kdevelop/
 usr/share/kdevfiletemplates/
 usr/share/kdevmanpage/
 usr/share/kdevqmljssupport/
-usr/share/knotifications5/
+usr/share/knotifications6/
 usr/share/knsrcfiles/
-usr/share/kservicetypes5/kdevelopplugin.desktop
+usr/share/kservicetypes6/kdevelopplugin.desktop
 usr/share/mime/
diff --git a/debian/kdevelop.install b/debian/kdevelop.install
index bf5ed3b..0925490 100644
--- a/debian/kdevelop.install
+++ b/debian/kdevelop.install
@@ -7,4 +7,4 @@ usr/share/applications/*
 usr/share/kdevgdb/
 usr/share/kdevlldb/
 usr/share/metainfo/*
-usr/share/qlogging-categories5/kdevelop.categories
+usr/share/qlogging-categories6/kdevelop.categories
diff --git a/debian/kdevplatform-libs.install b/debian/kdevplatform-libs.install
new file mode 100644
index 0000000..ef4a58b
--- /dev/null
+++ b/debian/kdevplatform-libs.install
@@ -0,0 +1,28 @@
+usr/bin/kdevplatform*
+usr/lib/*/libKDevPlatformDebugger.so.5.*
+usr/lib/*/libKDevPlatformDebugger.so.513
+usr/lib/*/libKDevPlatformDocumentation.so.5.*
+usr/lib/*/libKDevPlatformDocumentation.so.513
+usr/lib/*/libKDevPlatformInterfaces.so.5.*
+usr/lib/*/libKDevPlatformInterfaces.so.513
+usr/lib/*/libKDevPlatformLanguage.so.5.*
+usr/lib/*/libKDevPlatformLanguage.so.513
+usr/lib/*/libKDevPlatformOutputView.so.5.*
+usr/lib/*/libKDevPlatformOutputView.so.513
+usr/lib/*/libKDevPlatformProject.so.5.*
+usr/lib/*/libKDevPlatformProject.so.513
+usr/lib/*/libKDevPlatformSerialization.so.5.*
+usr/lib/*/libKDevPlatformSerialization.so.513
+usr/lib/*/libKDevPlatformShell.so.5.*
+usr/lib/*/libKDevPlatformShell.so.513
+usr/lib/*/libKDevPlatformSublime.so.5.*
+usr/lib/*/libKDevPlatformSublime.so.513
+usr/lib/*/libKDevPlatformUtil.so.5.*
+usr/lib/*/libKDevPlatformUtil.so.513
+usr/lib/*/libKDevPlatformVcs.so.5.*
+usr/lib/*/libKDevPlatformVcs.so.513
+usr/lib/*/qt6/plugins/grantlee/
+usr/lib/*/qt6/plugins/kdevplatform/
+usr/lib/*/qt6/qml6/org/kde/kdevplatform/
+usr/share/kdevplatform/shellutils/.zshrc
+usr/share/qlogging-categories6/kdevplatform.categories
diff --git a/debian/kdevplatform-libs.lintian-overrides b/debian/kdevplatform-libs.lintian-overrides
new file mode 100644
index 0000000..fed43e7
--- /dev/null
+++ b/debian/kdevplatform-libs.lintian-overrides
@@ -0,0 +1,3 @@
+# rpath for private libraries - gray area, this is adding non-standard library path for use for kdevelop.
+kdevplatform-libs: binary-or-shlib-defines-rpath usr/lib/x86_64-linux-gnu/qt6/plugins/kdevplatform/35/kdevclangsupport.so /usr/lib/llvm-13/lib
+kdevplatform-libs: package-name-doesnt-match-sonames libKDevPlatformDebugger
diff --git a/debian/plasma-kdevelop.install b/debian/plasma-kdevelop.install
index edd2247..1a6e1cd 100644
--- a/debian/plasma-kdevelop.install
+++ b/debian/plasma-kdevelop.install
@@ -1,5 +1,5 @@
 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/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/
diff --git a/debian/rules b/debian/rules
index de47b7e..740b8e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,20 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
 %:
-	dh $@ --parallel --with kf5
+	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf debian/man/out
 	-rmdir debian/man
 
+override_dh_install:
+	dh_install --list-missing
+
 override_dh_auto_build:
 	dh_auto_build --parallel
 	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
@@ -18,4 +23,7 @@ override_dh_auto_build:
 		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
 	done
 
+override_dh_strip:
+	dh_strip
+
 .PHONY: override_dh_auto_test


More information about the Neon-commits mailing list