[neon/extras/kdevelop/Neon/experimental] debian: defaff a little to make solib bumps easier

Carlos De Maine null at kde.org
Sun Apr 14 09:01:53 BST 2024


Git commit ecffc2e9fde26ccb739257bbd070e71172288924 by Carlos De Maine.
Committed on 14/04/2024 at 08:01.
Pushed by carlosdem into branch 'Neon/experimental'.

defaff a little to make solib bumps easier

M  +4    -5    debian/control
M  +12   -23   debian/kdevplatform-libs.install
M  +1    -1    debian/kdevplatform-libs.lintian-overrides
D  +0    -2    debian/kdevplatform511-libs.lintian-overrides
D  +0    -28   debian/kdevplatform513-libs.install

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

diff --git a/debian/control b/debian/control
index c9e1323..82ed499 100644
--- a/debian/control
+++ b/debian/control
@@ -40,9 +40,9 @@ Build-Depends: clazy,
                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],
+               libclang-15-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-15-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,
@@ -57,7 +57,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-std/kdevelop.git
 
 Package: kdevelop
 Architecture: any
-Depends: clang-tidy-14,
+Depends: clang-tidy-15,
          clazy,
          cppcheck,
          heaptrack-gui,
@@ -127,8 +127,7 @@ Depends: qml6-module-qtquick-controls,
          qml6-module-qtquick,
          ${misc:Depends},
          ${shlibs:Depends}
-Replaces: kdevplatform513-libs,
-Breaks: kdevplatform513-libs,
+Breaks: kdevplatform513-libs (<< ${source:Version}~ciBuild),
 Provides: qml6-module-org-kde-kdevplatform
 Suggests: cvs, git, kdevplatform-l10n, konsole, zsh
 Description: shared libraries for the KDevelop platform
diff --git a/debian/kdevplatform-libs.install b/debian/kdevplatform-libs.install
index ef4a58b..01b3dc4 100644
--- a/debian/kdevplatform-libs.install
+++ b/debian/kdevplatform-libs.install
@@ -1,28 +1,17 @@
 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/*/libKDevPlatformDebugger.so.*
+usr/lib/*/libKDevPlatformDocumentation.*
+usr/lib/*/libKDevPlatformInterfaces.so.*
+usr/lib/*/libKDevPlatformLanguage.so.*
+usr/lib/*/libKDevPlatformOutputView.so.*
+usr/lib/*/libKDevPlatformProject.so.*
+usr/lib/*/libKDevPlatformSerialization.so.*
+usr/lib/*/libKDevPlatformShell.so.*
+usr/lib/*/libKDevPlatformSublime.so.*
+usr/lib/*/libKDevPlatformUtil.so.*
+usr/lib/*/libKDevPlatformVcs.so.*
 usr/lib/*/qt6/plugins/grantlee/
 usr/lib/*/qt6/plugins/kdevplatform/
-usr/lib/*/qt6/qml6/org/kde/kdevplatform/
+usr/lib/*/qt6/qml/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
index fed43e7..7dc2633 100644
--- a/debian/kdevplatform-libs.lintian-overrides
+++ b/debian/kdevplatform-libs.lintian-overrides
@@ -1,3 +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: binary-or-shlib-defines-rpath usr/lib/x86_64-linux-gnu/qt6/plugins/kdevplatform/35/kdevclangsupport.so /usr/lib/llvm-15/lib
 kdevplatform-libs: package-name-doesnt-match-sonames libKDevPlatformDebugger
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.install b/debian/kdevplatform513-libs.install
deleted file mode 100644
index cc929f0..0000000
--- a/debian/kdevplatform513-libs.install
+++ /dev/null
@@ -1,28 +0,0 @@
-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/*/qt5/plugins/grantlee/
-usr/lib/*/qt5/plugins/kdevplatform/
-usr/lib/*/qt5/qml/org/kde/kdevplatform/
-usr/share/kdevplatform/shellutils/.zshrc
-usr/share/qlogging-categories5/kdevplatform.categories


More information about the Neon-commits mailing list