[neon/kde/layer-shell-qt/Neon/unstable] debian: port to kf6

Carlos De Maine null at kde.org
Tue Mar 14 03:40:28 GMT 2023


Git commit bd9b43cc968caf42b7bd53b79142283c689ef682 by Carlos De Maine.
Committed on 14/03/2023 at 00:59.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +5    -6    debian/control
M  +1    -1    debian/liblayershellqtinterface-dev.install
M  +5    -6    debian/rules

https://invent.kde.org/neon/kde/layer-shell-qt/commit/bd9b43cc968caf42b7bd53b79142283c689ef682

diff --git a/debian/control b/debian/control
index 7ae6993..82273bb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Norbert Preining <norbert at preining.info>
 Build-Depends: cmake (>= 3.16~),
                debhelper-compat (= 13),
-               extra-cmake-modules (>= 5.82~),
-               qt6-wayland-dev,
+               kf6-extra-cmake-modules,
                libwayland-bin,
                libwayland-dev (>= 1.3~),
                libxkbcommon-dev,
@@ -14,9 +13,9 @@ Build-Depends: cmake (>= 3.16~),
                pkg-kde-tools-neon,
                qt6-base-dev,
                qt6-declarative-dev,
-               qt6-wayland-dev-tools,
                qt6-wayland-dev,
-               wayland-protocols,
+               qt6-wayland-dev-tools,
+               wayland-protocols
 Standards-Version: 4.5.1
 Homepage: http://www.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/layer-shell-qt
@@ -35,9 +34,9 @@ Description: use the Wayland wl-layer-shell protocol.
 Package: liblayershellqtinterface-dev
 Architecture: any
 Depends: liblayershellqtinterface5 (= ${binary:Version}),
-         qtbase5-dev,
+         qt6-base-dev,
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: use the Wayland wl-layer-shell protocol.
  Qt component to allow applications to make use of the Wayland
  wl-layer-shell protocol.
diff --git a/debian/liblayershellqtinterface-dev.install b/debian/liblayershellqtinterface-dev.install
index 0f3ebf4..d92646d 100644
--- a/debian/liblayershellqtinterface-dev.install
+++ b/debian/liblayershellqtinterface-dev.install
@@ -1,3 +1,3 @@
-usr/include/LayerShellQt/
+usr/kf6/include/LayerShellQt/
 usr/kf6/lib/*/cmake/LayerShellQt/
 usr/kf6/lib/*/libLayerShellQtInterface.so
diff --git a/debian/rules b/debian/rules
index 27f896b..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with pkgkde_symbolshelper,kf5
+	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_clean:
-	rm -rf .clang-format
-	dh_clean
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/



More information about the Neon-commits mailing list