[neon/extras/kdevelop/Neon/unstable] debian: a thorough defaffing

Carlos De Maine null at kde.org
Mon Nov 20 12:07:55 GMT 2023


Git commit 39b6d2f055a7a364019093387b0ca92dbf9d35e9 by Carlos De Maine.
Committed on 20/11/2023 at 13:07.
Pushed by carlosdem into branch 'Neon/unstable'.

a thorough defaffing

M  +10   -107  debian/control
M  +7    -6    debian/kdevelop.lintian-overrides
D  +0    -2    debian/kdevplatform511-libs.lintian-overrides
A  +5    -0    debian/kdevplatform513-libs.lintian-overrides
A  +1    -0    debian/plasma-kdevelop.lintian-overrides
M  +2    -2    debian/rules

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

diff --git a/debian/control b/debian/control
index a5cb921..4f7ea60 100644
--- a/debian/control
+++ b/debian/control
@@ -74,9 +74,7 @@ Depends: clang-tidy-14,
          ${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)
+Suggests: cmake, heaptrack, ninja-build
 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
@@ -91,20 +89,6 @@ 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
@@ -123,8 +107,6 @@ Depends: kdevelop (= ${binary:Version}),
          libkf5texteditor-dev,
          libkf5syntaxhighlighting-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 +118,7 @@ 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)
+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
@@ -199,47 +134,16 @@ Depends: plasma-framework,
          qml-module-qtquick2,
          ${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,
+Replaces: 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,
+          kdevplatform514-libs,
+Breaks: 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
+        kdevplatform512-libs,
+        kdevplatform514-libs,
 Provides: qml-module-org-kde-kdevplatform
-Suggests: cvs, git, kdevplatform-l10n, konsole, zsh
+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.
@@ -251,6 +155,7 @@ Section: libdevel
 Architecture: any
 Depends: kdevplatform513-libs (= ${binary:Version}),
          libkf5archive-dev,
+         libkf5syntaxhighlighting-dev,
          libkf5texteditor-dev,
          libkf5threadweaver-dev,
          qtbase5-dev,
@@ -265,10 +170,8 @@ Description: development files for the KDevelop platform
  This package is part of the KDevelop platform.
 
 Package: plasma-kdevelop
-Architecture: linux-any
+Architecture: 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.lintian-overrides b/debian/kdevelop.lintian-overrides
index a025d3e..b8106e6 100644
--- a/debian/kdevelop.lintian-overrides
+++ b/debian/kdevelop.lintian-overrides
@@ -1,7 +1,8 @@
-kdevelop: package-name-doesnt-match-sonames libKDevClangPrivate25 libkdevcmakecommon
+kdevelop: custom-library-search-path RUNPATH /usr/lib/llvm-14/lib [usr/lib/x86_64-linux-gnu/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/x86_64-linux-gnu/libKDevCMakeCommon.so.513 usr/lib/x86_64-linux-gnu/libKDevCMakeCommon.so
+kdevelop: lacks-unversioned-link-to-shared-library usr/lib/x86_64-linux-gnu/libKDevClangPrivate.so.513 usr/lib/x86_64-linux-gnu/libKDevClangPrivate.so
+kdevelop: lacks-unversioned-link-to-shared-library usr/lib/x86_64-linux-gnu/libKDevCompileAnalyzerCommon.so.513 usr/lib/x86_64-linux-gnu/libKDevCompileAnalyzerCommon.so
+kdevelop: package-name-doesnt-match-sonames libKDevCMakeCommon513 libKDevClangPrivate513 libKDevCompileAnalyzerCommon513
 kdevelop: shlib-without-versioned-soname usr/lib/x86_64-linux-gnu/libkdevcmakecommon.so libkdevcmakecommon.so
-# private libs, no soversion
-kdevelop: dev-pkg-without-shlib-symlink usr/lib/x86_64-linux-gnu/libkdevcmakecommon.so usr/lib/x86_64-linux-gnu/libkdevcmakecommon.so
-kdevelop: dev-pkg-without-shlib-symlink usr/lib/x86_64-linux-gnu/libKDevClangPrivate.so.25 usr/lib/x86_64-linux-gnu/libKDevClangPrivate.so
-# rpath for private libraries - gray area, this is adding non-standard library path for private use for kdevelop.
-kdevelop: binary-or-shlib-defines-rpath usr/lib/x86_64-linux-gnu/libKDevClangPrivate.so.35 /usr/lib/llvm-8/lib
diff --git a/debian/kdevplatform511-libs.lintian-overrides b/debian/kdevplatform511-libs.lintian-overrides
deleted file mode 100644
index 9f0e5ef..0000000
--- a/debian/kdevplatform511-libs.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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/kdevplatform513-libs.lintian-overrides b/debian/kdevplatform513-libs.lintian-overrides
new file mode 100644
index 0000000..5466358
--- /dev/null
+++ b/debian/kdevplatform513-libs.lintian-overrides
@@ -0,0 +1,5 @@
+kdevplatform513-libs: binary-or-shlib-defines-rpath usr/lib/x86_64-linux-gnu/qt5/plugins/kdevplatform/35/kdevclangsupport.so /usr/lib/llvm-13/lib
+kdevplatform513-libs: custom-library-search-path RUNPATH /usr/lib/llvm-14/lib [usr/lib/x86_64-linux-gnu/qt5/plugins/kdevplatform/513/kdevclangsupport.so]
+kdevplatform513-libs: package-name-doesnt-match-sonames libKDevPlatformDebugger513 libKDevPlatformDocumentation513 libKDevPlatformInterfaces513 libKDevPlatformLanguage513 libKDevPlatformOutputView513 libKDevPlatformProject513 libKDevPlatformSerialization513 libKDevPlatformShell513 libKDevPlatformSublime513 libKDevPlatformUtil513 libKDevPlatformVcs513
+kdevplatform513-libs: script-with-language-extension usr/bin/kdevplatform_shell_environment.sh
+kdevplatform513-libs: shell-script-fails-syntax-check usr/bin/kdevplatform_shell_environment.sh
diff --git a/debian/plasma-kdevelop.lintian-overrides b/debian/plasma-kdevelop.lintian-overrides
new file mode 100644
index 0000000..a728508
--- /dev/null
+++ b/debian/plasma-kdevelop.lintian-overrides
@@ -0,0 +1 @@
+plasma-kdevelop: package-name-doesnt-match-sonames libKDevelopSessionsWatch
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index de47b7e..0c4ebd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
 %:
-	dh $@ --parallel --with kf5
+	dh $@ --with kf5
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -11,7 +11,7 @@ override_dh_auto_clean:
 	-rmdir debian/man
 
 override_dh_auto_build:
-	dh_auto_build --parallel
+	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 \


More information about the Neon-commits mailing list