[neon/extras/kdevelop/Neon/unstable] debian: Revert "kf6ify"
Carlos De Maine
null at kde.org
Wed Sep 27 04:34:18 BST 2023
Git commit 26b3f981353d522969db524684ee97c1f08123b2 by Carlos De Maine.
Committed on 27/09/2023 at 05:34.
Pushed by carlosdem into branch 'Neon/unstable'.
Revert "kf6ify"
This reverts commit 1cef113deac742a36cf829ec7dc4c5146f78f84c.
A +1 -0 debian/compat
M +168 -60 debian/control
M +2 -2 debian/kdevelop-data.install
M +1 -1 debian/kdevelop.install
D +0 -3 debian/kdevplatform-libs.lintian-overrides
A +2 -0 debian/kdevplatform511-libs.lintian-overrides
R +4 -4 debian/kdevplatform513-libs.install [from: debian/kdevplatform-libs.install - 085% similarity]
M +3 -3 debian/plasma-kdevelop.install
M +2 -4 debian/rules
https://invent.kde.org/neon/extras/kdevelop/-/commit/26b3f981353d522969db524684ee97c1f08123b2
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..f599e28
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/control b/debian/control
index 22e7a55..a95104c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,49 +8,51 @@ Uploaders: Jeremy Lainé <jeremy.laine at m4x.org>,
Build-Depends: clazy,
cmake,
cppcheck,
- debhelper-compat (= 13),
+ debhelper (>= 9),
+ 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-kpurpose-dev,
- kf6-krunner-dev [linux-any],
- kf6-kservice-dev,
- kf6-ksyntaxhighlighting-dev,
- kf6-ktexteditor-dev,
- kf6-ktexttemplate-dev,
- kf6-threadweaver-dev,
- kf6-kwindowsystem-dev,
- kf6-kxmlgui-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-neon,
- qt6-base-dev,
- qt6-declarative-dev,
- qt6-tools-dev,
- qt6-webengine-dev,
- shared-mime-info,
-Standards-Version: 4.6.2
+ okteta-dev,
+ pkg-kde-tools (>> 0.15.15),
+ qtbase5-dev,
+ qtdeclarative5-dev,
+ qttools5-dev,
+ qttools5-dev-tools,
+ qtwebengine5-dev,
+ shared-mime-info
+Standards-Version: 4.1.0
Homepage: http://www.kdevelop.org/
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/kde-std/kdevelop.git
Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-std/kdevelop.git
@@ -63,16 +65,18 @@ Depends: clang-tidy-14,
heaptrack-gui,
kdevelop-data (>= ${source:Version}),
kdevelop-l10n,
- kf6-plasma-framework,
libclang-common-14-dev,
+ libqt5webengine5,
meson,
- qml6-module-qtquick-controls,
- qml6-module-qtquick,
- qt6-webengine,
+ plasma-framework,
+ qml-module-qtquick-controls,
+ qml-module-qtquick2,
${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
@@ -83,10 +87,24 @@ Description: integrated development environment for KDE
Package: kdevelop-data
Architecture: all
-Depends: kf6-plasma-framework,
- qml6-module-qtquick-controls,
- qml6-module-qtquick2,
+Depends: plasma-framework,
+ qml-module-qtquick-controls,
+ qml-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
@@ -100,10 +118,12 @@ Section: libdevel
Architecture: any
Depends: kdevelop (= ${binary:Version}),
kdevplatform-dev,
- kf6-karchive-dev,
- kf6-kconfigwidgets-dev,
- kf6-ktexteditor-dev,
+ libkf5archive-dev,
+ libkf5configwidgets-dev,
+ libkf5texteditor-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
@@ -115,7 +135,54 @@ 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
@@ -124,16 +191,53 @@ Description: localization files for the KDevelop IDE
.
This package contains the translations for KDevelop.
-Package: kdevplatform-libs
+Package: kdevplatform513-libs
Architecture: any
-Depends: kf6-plasma-framework,
- qml6-module-qtquick-controls,
- qml6-module-qtquick,
+Depends: plasma-framework,
+ qml-module-qtquick-controls,
+ qml-module-qtquick2,
${misc:Depends},
${shlibs:Depends}
-Replaces: kdevplatform513-libs,
-Breaks: kdevplatform513-libs,
-Provides: qml6-module-org-kde-kdevplatform
+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
Suggests: cvs, git, kdevplatform-l10n, konsole, zsh
Description: shared libraries for the KDevelop platform
This package contains shared libraries needed to run integrated development
@@ -144,13 +248,15 @@ Description: shared libraries for the KDevelop platform
Package: kdevplatform-dev
Section: libdevel
Architecture: any
-Depends: kdevplatform-libs (= ${binary:Version}),
- kf6-karchive-dev,
- kf6-ktexteditor-dev,
- kf6-threadweaver-dev,
- qt6-base-dev,
- qt6-declarative-dev,
+Depends: kdevplatform513-libs (= ${binary:Version}),
+ libkf5archive-dev,
+ libkf5texteditor-dev,
+ libkf5threadweaver-dev,
+ qtbase5-dev,
+ qtdeclarative5-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.
@@ -160,6 +266,8 @@ 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 5bfa354..539114f 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/knotifications6/
+usr/share/knotifications5/
usr/share/knsrcfiles/
-usr/share/kservicetypes6/kdevelopplugin.desktop
+usr/share/kservicetypes5/kdevelopplugin.desktop
usr/share/mime/
diff --git a/debian/kdevelop.install b/debian/kdevelop.install
index 0925490..bf5ed3b 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-categories6/kdevelop.categories
+usr/share/qlogging-categories5/kdevelop.categories
diff --git a/debian/kdevplatform-libs.lintian-overrides b/debian/kdevplatform-libs.lintian-overrides
deleted file mode 100644
index fed43e7..0000000
--- a/debian/kdevplatform-libs.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# 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/kdevplatform511-libs.lintian-overrides b/debian/kdevplatform511-libs.lintian-overrides
new file mode 100644
index 0000000..9f0e5ef
--- /dev/null
+++ b/debian/kdevplatform511-libs.lintian-overrides
@@ -0,0 +1,2 @@
+# rpath for private libraries - gray area, this is adding non-standard library path for use for kdevelop.
+kdevplatform511-libs: binary-or-shlib-defines-rpath usr/lib/x86_64-linux-gnu/qt5/plugins/kdevplatform/35/kdevclangsupport.so /usr/lib/llvm-13/lib
diff --git a/debian/kdevplatform-libs.install b/debian/kdevplatform513-libs.install
similarity index 85%
rename from debian/kdevplatform-libs.install
rename to debian/kdevplatform513-libs.install
index ef4a58b..cc929f0 100644
--- a/debian/kdevplatform-libs.install
+++ b/debian/kdevplatform513-libs.install
@@ -21,8 +21,8 @@ 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/lib/*/qt5/plugins/grantlee/
+usr/lib/*/qt5/plugins/kdevplatform/
+usr/lib/*/qt5/qml/org/kde/kdevplatform/
usr/share/kdevplatform/shellutils/.zshrc
-usr/share/qlogging-categories6/kdevplatform.categories
+usr/share/qlogging-categories5/kdevplatform.categories
diff --git a/debian/plasma-kdevelop.install b/debian/plasma-kdevelop.install
index 1a6e1cd..edd2247 100644
--- a/debian/plasma-kdevelop.install
+++ b/debian/plasma-kdevelop.install
@@ -1,5 +1,5 @@
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/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/
diff --git a/debian/rules b/debian/rules
index 740b8e5..d29cbb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,9 @@
#!/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 $@ --with kf6 --buildsystem kf6
+ dh $@ --parallel --with kf5
override_dh_auto_clean:
dh_auto_clean
@@ -24,6 +22,6 @@ override_dh_auto_build:
done
override_dh_strip:
- dh_strip
+ dh_strip --dbgsym-migration='kdevelop-dbg (<< 4:4.7.3-3~)'
.PHONY: override_dh_auto_test
More information about the Neon-commits
mailing list