[neon/kde/kdecoration/Neon/unstable] debian: bump private solib as well && cleanups

Carlos De Maine null at kde.org
Mon Nov 6 03:21:27 GMT 2023


Git commit 730829c06e4034c9860ebdc699b15ff2f8a5cb42 by Carlos De Maine.
Committed on 06/11/2023 at 04:21.
Pushed by carlosdem into branch 'Neon/unstable'.

bump private solib as well && cleanups

M  +9    -29   debian/control
R  +1    -1    debian/libkdecorations2private11.install [from: debian/libkdecorations2private10.install - 050% similarity]
M  +1    -4    debian/rules

https://invent.kde.org/neon/kde/kdecoration/-/commit/730829c06e4034c9860ebdc699b15ff2f8a5cb42

diff --git a/debian/control b/debian/control
index 4dea2ec..c7fee9d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Scarlett Moore <sgmoore at kde.org>,
            Patrick Franz <patfra71 at gmail.com>,
            Norbert Preining <norbert at preining.info>
-Build-Depends: cmake (>= 3.0~),
+Build-Depends: cmake,
                debhelper-compat (= 13),
                gettext,
                kf6-extra-cmake-modules,
@@ -13,7 +13,7 @@ Build-Depends: cmake (>= 3.0~),
                kf6-ki18n-dev,
                pkg-kde-tools-neon,
                qt6-base-dev
-Standards-Version: 4.5.1
+Standards-Version: 4.6.2
 Homepage: https://invent.kde.org/plasma/kdecoration
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdecoration
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kdecoration.git
@@ -23,16 +23,6 @@ Package: libkdecorations2-6
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kwin-common (<< 4:5.20.90),
-        kwin-decoration-oxygen (<< 4:5.20.90),
-        kwin-style-breeze (<< 4:5.20.90),
-        kwin-wayland (<< 4:5.20.90),
-        kwin-wayland-backend-drm (<< 4:5.20.90),
-        kwin-wayland-backend-fbdev (<< 4:5.20.90),
-        kwin-wayland-backend-virtual (<< 4:5.20.90),
-        kwin-wayland-backend-wayland (<< 4:5.20.90),
-        kwin-wayland-backend-x11 (<< 4:5.20.90),
-        kwin-x11 (<< 4:5.20.90)
 Description: library to create window decorations
  KDecoration2 is a library to create window decorations. These window
  decorations can be used by for example an X11 based window manager
@@ -42,8 +32,8 @@ Package: libkdecorations2-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkdecorations2-5v5 (= ${binary:Version}),
-         libkdecorations2private10 (= ${binary:Version}),
+Depends: libkdecorations2-6 (= ${binary:Version}),
+         libkdecorations2private11 (= ${binary:Version}),
          qt6-base-dev,
          ${misc:Depends}
 Description: library to create window decorations - development files
@@ -53,22 +43,12 @@ Description: library to create window decorations - development files
  .
  This package contains the development files.
 
-Package: libkdecorations2private10
+Package: libkdecorations2private11
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libkdecorations2private5,
-        libkdecorations2private5v5,
-        libkdecorations2private6,
-        libkdecorations2private7,
-        libkdecorations2private8,
-        libkdecorations2private9 (<< 4:5.26.4)
-Replaces: libkdecorations2private5,
-          libkdecorations2private5v5,
-          libkdecorations2private6,
-          libkdecorations2private7,
-          libkdecorations2private8,
-          libkdecorations2private9 (<< 4:5.26.4)
+#Breaks: libkdecorations2private10 (<< ${source:Version}~ciBuild)
+Replaces: libkdecorations2private10 (<< ${source:Version}~ciBuild)
 Description: library to create window decorations - private library
  KDecoration2 is a library to create window decorations. These window
  decorations can be used by for example an X11 based window manager
@@ -83,9 +63,9 @@ Depends: libkdecorations2-6, ${misc:Depends}, ${shlibs:Depends}
 Description: dummy transitional
  Empty transitional package.
 
-Package: libkdecorations2private9
+Package: libkdecorations2private10
 Architecture: any
 Multi-Arch: same
-Depends: libkdecorations2private10, ${misc:Depends}, ${shlibs:Depends}
+Depends: libkdecorations2private11, ${misc:Depends}, ${shlibs:Depends}
 Description: dummy transitional
  Empty transitional package.
diff --git a/debian/libkdecorations2private10.install b/debian/libkdecorations2private11.install
similarity index 50%
rename from debian/libkdecorations2private10.install
rename to debian/libkdecorations2private11.install
index dd256cc..d8100ec 100644
--- a/debian/libkdecorations2private10.install
+++ b/debian/libkdecorations2private11.install
@@ -1,2 +1,2 @@
-usr/lib/*/libkdecorations2private.so.10
+usr/lib/*/libkdecorations2private.so.11
 usr/lib/*/libkdecorations2private.so.5.*
diff --git a/debian/rules b/debian/rules
index 47c772a..0c9d532 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,4 @@
 # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf6 --buildsystem kf6
-
-override_dh_shlibdeps:
-	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
+	dh $@ --with kf6 --buildsystem kf6
\ No newline at end of file


More information about the Neon-commits mailing list