[neon/extras/kdevelop/Neon/unstable] debian: kf6ify

Carlos De Maine null at kde.org
Wed Jul 31 02:42:22 BST 2024


Git commit be433838b3c3640548d188fb5b78ca789ad2e3ae by Carlos De Maine.
Committed on 31/07/2024 at 01:42.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

M  +0    -7    debian/changelog
M  +57   -76   debian/control
M  +8    -6    debian/kdevelop.lintian-overrides
M  +1    -5    debian/plasma-kdevelop.install
M  +2    -2    debian/plasma-kdevelop.lintian-overrides
M  +5    -17   debian/rules

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

diff --cc debian/changelog
index cbe530a,ee7b0cd..95ecd9e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1743,4 -1743,4 +1737,3 @@@ kdevelop (990422-1) experimental; urgen
    * Initial Release
  
   -- Bernd Gehrmann <bernd at physik.hu-berlin.de>  Thu, 22 Apr 1999 20:33:18 +0200
--
diff --cc debian/control
index 66afa44,10f8335..17c7707
--- a/debian/control
+++ b/debian/control
@@@ -9,49 -9,47 +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-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,
+                libkomparediff2-dev,
                 libastyle-dev,
                 libboost-dev (>= 1.35.0),
-                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,
-                libqt5webkit5-dev (>= 5.4.0),
+                libclang-14-dev (>= 1:3.8) [!alpha !hppa !hurd-any !ia64 !kfreebsd-any !m68k !powerpcspe !riscv64 !sh4 !x32],
                 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
@@@ -184,4 -165,4 +165,4 @@@ Description: KDevelop plugins for Plasm
   desktop environment:
    * sessions data engine
    * sessions widget
--  * sessions KRunner module
++  * sessions KRunner module
diff --cc debian/kdevelop.lintian-overrides
index f411d82,972a267..cad471b
--- a/debian/kdevelop.lintian-overrides
+++ b/debian/kdevelop.lintian-overrides
@@@ -1,8 -1,10 +1,10 @@@
- kdevelop: custom-library-search-path RUNPATH /usr/lib/llvm-14/lib [usr/lib/*/libKDevClangPrivate.so.513]
  kdevelop: desktop-mime-but-no-exec-code usr/share/applications/org.kde.kdevelop.desktop
  kdevelop: desktop-mime-but-no-exec-code usr/share/applications/org.kde.kdevelop_ps.desktop
- kdevelop: lacks-unversioned-link-to-shared-library usr/lib/*/libKDevCMakeCommon.so.513 usr/lib/*/libKDevCMakeCommon.so
- kdevelop: lacks-unversioned-link-to-shared-library usr/lib/*/libKDevClangPrivate.so.513 usr/lib/*/libKDevClangPrivate.so
- kdevelop: lacks-unversioned-link-to-shared-library usr/lib/*/libKDevCompileAnalyzerCommon.so.513 usr/lib/*/libKDevCompileAnalyzerCommon.so
- kdevelop: package-name-doesnt-match-sonames libKDevCMakeCommon513 libKDevClangPrivate513 libKDevCompileAnalyzerCommon513
- kdevelop: shlib-without-versioned-soname usr/lib/*/libkdevcmakecommon.so libkdevcmakecommon.so
+ 
+ kdevelop: lacks-unversioned-link-to-shared-library usr/lib/*/libKDevCMakeCommon.so.* usr/lib/*/libKDevCMakeCommon.so
+ kdevelop: lacks-unversioned-link-to-shared-library usr/lib/*/libKDevClangPrivate.so.* usr/lib/*/libKDevClangPrivate.so
+ kdevelop: lacks-unversioned-link-to-shared-library usr/lib/*/libKDevCompileAnalyzerCommon.so.* usr/lib/*/libKDevCompileAnalyzerCommon.so
+ 
+ kdevelop: package-name-doesnt-match-sonames libKDevCMakeCommon* libKDevClangPrivate* libKDevCompileAnalyzerCommon*
+ 
 -kdevelop: custom-library-search-path RUNPATH /usr/lib/llvm-14/lib [usr/lib/*/libKDevClangPrivate.so.*]
++kdevelop: custom-library-search-path RUNPATH /usr/lib/llvm-14/lib [usr/lib/*/libKDevClangPrivate.so.*]
diff --cc debian/plasma-kdevelop.install
index ac18baa,6556ea7..8c628bf
--- a/debian/plasma-kdevelop.install
+++ b/debian/plasma-kdevelop.install
@@@ -1,5 -1,1 +1,1 @@@
- #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/
 -#usr/lib/*/qt6/qml/org/kde/plasma/
++#usr/lib/*/qt6/qml/org/kde/plasma/
diff --cc debian/plasma-kdevelop.lintian-overrides
index 009db3a,176d9c8..3115943
--- a/debian/plasma-kdevelop.lintian-overrides
+++ b/debian/plasma-kdevelop.lintian-overrides
@@@ -1,2 -1,2 +1,2 @@@
- plasma-kdevelop: package-name-doesnt-match-sonames libKDevelopSessionsWatch
- plasma-kdevelop: shared-library-lacks-version usr/lib/*/libKDevelopSessionsWatch.so libKDevelopSessionsWatch.so
+ plasma-kdevelop: empty-binary-package
 -plasma-kdevelop: package-has-unnecessary-activation-of-ldconfig-trigger
++plasma-kdevelop: package-has-unnecessary-activation-of-ldconfig-trigger
diff --cc debian/rules
index 0c4ebd7,d0a9c65..359b898
--- a/debian/rules
+++ b/debian/rules
@@@ -1,21 -1,9 +1,9 @@@
  #!/usr/bin/make -f
- 
- export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+ # SPDX-License-Identifier: LGPL-2.0-or-later
+ # # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
  
  %:
- 	dh $@ --with kf5
- 
- override_dh_auto_clean:
- 	dh_auto_clean
- 	rm -rf debian/man/out
- 	-rmdir debian/man
- 
- override_dh_auto_build:
- 	dh_auto_build
- 	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
- 	for f in $$(find debian/man -name '*.man'); do \
- 		soelim -I debian/man $$f \
- 		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
- 	done
+ 	dh $@ --with kf6 --buildsystem kf6
  
- .PHONY: override_dh_auto_test
+ override_dh_auto_configure:
 -	dh_auto_configure -- -DBUILD_WITH_QT6=ON
++	dh_auto_configure -- -DBUILD_WITH_QT6=ON


More information about the Neon-commits mailing list