[neon/kde/kio/Neon/unstable] debian: more clashes

Carlos De Maine null at kde.org
Wed Aug 30 08:04:11 BST 2023


Git commit 7b944f084d10127e4de9a4584b707ed6009e1004 by Carlos De Maine.
Committed on 30/08/2023 at 09:04.
Pushed by carlosdem into branch 'Neon/unstable'.

more clashes

M  +8    -8    debian/kio.install
M  +1    -0    debian/not-installed

https://invent.kde.org/neon/kde/kio/-/commit/7b944f084d10127e4de9a4584b707ed6009e1004

diff --git a/debian/kio.install b/debian/kio.install
index 84a2f51..981ddf1 100644
--- a/debian/kio.install
+++ b/debian/kio.install
@@ -24,16 +24,16 @@ usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_proxy.so
 usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_webshortcuts.so
 usr/share/applications/kcm_trash.desktop
 usr/share/applications/ktelnetservice5.desktop
-usr/share/dbus-1/services/org.kde.kcookiejar5.service
-usr/share/dbus-1/services/org.kde.kiod5.service
-usr/share/dbus-1/services/org.kde.kioexecd.service
-usr/share/dbus-1/services/org.kde.kpasswdserver.service
-usr/share/dbus-1/services/org.kde.kssld5.service
-usr/share/kconf_update/filepicker.upd
-usr/share/kdevappwizard/templates/kioworker.tar.bz2
+#usr/share/dbus-1/services/org.kde.kcookiejar5.service
+#usr/share/dbus-1/services/org.kde.kiod5.service
+#usr/share/dbus-1/services/org.kde.kioexecd.service
+#usr/share/dbus-1/services/org.kde.kpasswdserver.service
+#usr/share/dbus-1/services/org.kde.kssld5.service
+#usr/share/kconf_update/filepicker.upd
+3usr/share/kdevappwizard/templates/kioworker.tar.bz2
 usr/share/kf5/kcookiejar/domain_info
 usr/share/knotifications5/proxyscout.notifyrc
 usr/share/kservices5/
 usr/share/kservicetypes5/
 usr/share/locale/*/*/kio5.mo
-usr/share/doc/HTML/
+#usr/share/doc/HTML/
diff --git a/debian/not-installed b/debian/not-installed
index 801390f..b5bcba8 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -6,3 +6,4 @@ usr/share/kdevfiletemplates/templates/kioworker.tar.bz2
 #kf6-kio clash
 etc/xdg/accept-languages.codes
 etc/xdg/kshorturifilterrc
+usr/share/dbus-1/services/
\ No newline at end of file


More information about the Neon-commits mailing list