[neon/kf6/kf6-kio/Neon/unstable] debian: fix conflict

Carlos De Maine null at kde.org
Sat May 13 03:42:39 BST 2023


Git commit b0a715be1a65a752f2ff7b49ee57041579df57db by Carlos De Maine.
Committed on 13/05/2023 at 02:42.
Pushed by carlosdem into branch 'Neon/unstable'.

fix conflict

M  +1    -0    debian/kf6-kio-dev.install
M  +0    -1    debian/kf6-kio.install

https://invent.kde.org/neon/kf6/kf6-kio/commit/b0a715be1a65a752f2ff7b49ee57041579df57db

diff --git a/debian/kf6-kio-dev.install b/debian/kf6-kio-dev.install
index 62e3073..44905bc 100644
--- a/debian/kf6-kio-dev.install
+++ b/debian/kf6-kio-dev.install
@@ -7,3 +7,4 @@ usr/lib/*/libKF6KIOWidgets.so
 usr/lib/*/qt6/mkspecs/
 usr/lib/*/qt6/plugins/designer/
 usr/share/dbus-1/interfaces/
+
diff --git a/debian/kf6-kio.install b/debian/kf6-kio.install
index a5f7ca3..3026367 100644
--- a/debian/kf6-kio.install
+++ b/debian/kf6-kio.install
@@ -10,7 +10,6 @@ usr/lib/*/libKF6KIOWidgets.so.5.*
 usr/lib/*/libKF6KIOWidgets.so.6
 usr/lib/*/libexec/
 usr/lib/*/qt6/plugins/kcm*so
-usr/lib/*/qt6/plugins/
 usr/lib/*/qt6/plugins/plasma/
 usr/share/applications/
 usr/share/dbus-1/services/


More information about the Neon-commits mailing list