[neon/kde/layer-shell-qt/Neon/unstable] debian: merge the mess

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


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

merge the mess

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

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

diff --git a/debian/control b/debian/control
index c533aee..95095da 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Norbert Preining <norbert at preining.info>
 Build-Depends: cmake (>= 3.16~),
                debhelper-compat (= 13),
                kf6-extra-cmake-modules,
-               qt6-wayland-dev,
                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
@@ -34,10 +33,10 @@ Description: use the Wayland wl-layer-shell protocol.
 
 Package: liblayershellqtinterface-dev
 Architecture: any
-Depends: liblayershellqtinterface6 (= ${binary:Version}),
+Depends: liblayershellqtinterface5 (= ${binary:Version}),
          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.
@@ -52,4 +51,4 @@ Description: use the Wayland wl-layer-shell protocol.
  Qt component to allow applications to make use of the Wayland
  wl-layer-shell protocol.
  .
- This package includes the library.
+ This package includes the library.
\ No newline at end of file
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 113c5e3..f13d9eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,5 +6,4 @@
 	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_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
\ No newline at end of file


More information about the Neon-commits mailing list