[neon/kde/kio/Neon/release] debian: revert -DKF6_COMPAT_BUILD=ON in Neon/release for now
Jonathan Esk-Riddell
null at kde.org
Mon Jan 22 16:22:30 GMT 2024
Git commit 2d98a9a42253d6f2b4f2365d3198426b0858a76d by Jonathan Esk-Riddell.
Committed on 22/01/2024 at 17:22.
Pushed by jriddell into branch 'Neon/release'.
revert -DKF6_COMPAT_BUILD=ON in Neon/release for now
M +23 -0 debian/copyright
M +8 -1 debian/kio.install
M +0 -1 debian/kio.lintian-overrides
M +1 -1 debian/patches/series
M +1 -1 debian/rules
https://invent.kde.org/neon/kde/kio/-/commit/2d98a9a42253d6f2b4f2365d3198426b0858a76d
diff --git a/debian/copyright b/debian/copyright
index ac7408e..8af89c4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -93,6 +93,8 @@ Files: autotests/deletejobtest.cpp
src/core/commands_p.h
src/core/dataprotocol.cpp
src/core/dataprotocol_p.h
+ src/core/dataslave.cpp
+ src/core/dataslave_p.h
src/core/filejob.cpp
src/core/filejob.h
src/core/global.cpp
@@ -150,11 +152,20 @@ Files: autotests/deletejobtest.cpp
src/filewidgets/kfileplacesitem_p.h
src/filewidgets/kfileplacesmodel.cpp
src/filewidgets/kfileplacesmodel.h
+ src/filewidgets/kfileplacessharedbookmarks.cpp
+ src/filewidgets/kfileplacessharedbookmarks_p.h
src/filewidgets/kfileplacesview.cpp
src/filewidgets/kfileplacesview.h
src/filewidgets/kfileplacesview_p.h
src/filewidgets/kstatusbarofflineindicator.cpp
src/filewidgets/kstatusbarofflineindicator.h
+ src/ioslaves/help/kio_help.cpp
+ src/ioslaves/http/httpfilter.cpp
+ src/ioslaves/http/httpfilter.h
+ src/ioslaves/http/kcookiejar/kcookiejar.h
+ src/ioslaves/http/kcookiejar/kcookieserver.h
+ src/ioslaves/mailto/kmailservice.cpp
+ src/kioslave/kioslave.cpp
src/kntlm/kntlm.cpp
src/kntlm/kntlm.h
src/kpac/dhcp.h
@@ -180,6 +191,8 @@ Files: autotests/deletejobtest.cpp
src/widgets/skipdialog.cpp
src/widgets/skipdialog.h
tests/kdirmodeltest_gui.cpp
+ tests/kioslavetest.cpp
+ tests/kioslavetest.h
tests/kmountpoint_debug.cpp
tests/kruntest.cpp
tests/kruntest.h
@@ -224,6 +237,16 @@ License: LGPL-2
Files: autotests/kurlnavigatortest.cpp
autotests/kurlnavigatortest.h
+ src/ioslaves/http/kcookiejar/kcookiewin.h
+ src/ioslaves/telnet/ktelnetservice.cpp
+ src/ioslaves/trash/kcmtrash.cpp
+ src/ioslaves/trash/kcmtrash.h
+ src/kcms/kio/kcookiesmanagement.cpp
+ src/kcms/kio/kcookiesmanagement.h
+ src/kcms/kio/kcookiespolicies.cpp
+ src/kcms/kio/kcookiespolicies.h
+ src/kcms/kio/kcookiespolicyselectiondlg.cpp
+ src/kcms/kio/kcookiespolicyselectiondlg.h
src/kcms/kio/main.cpp
src/kcms/kio/useragentinfo.cpp
src/kcms/kio/useragentinfo.h
diff --git a/debian/kio.install b/debian/kio.install
index e431187..dbbc2cf 100644
--- a/debian/kio.install
+++ b/debian/kio.install
@@ -4,23 +4,30 @@ usr/bin/ktelnetservice5
usr/bin/ktrash5
usr/bin/protocoltojson
usr/lib/*/libexec/kf5/kio_http_cache_cleaner
+usr/lib/*/libexec/kf5/kiod5
+usr/lib/*/libexec/kf5/kioexec
usr/lib/*/libexec/kf5/kioslave5
usr/lib/*/libexec/kf5/kpac_dhcp_helper
usr/lib/*/qt5/plugins/kcm_proxy.so
-usr/lib/*/qt5/plugins/kcm_trash.so
usr/lib/*/qt5/plugins/kcm_webshortcuts.so
usr/lib/*/qt5/plugins/kf5/kded/kcookiejar.so
usr/lib/*/qt5/plugins/kf5/kded/proxyscout.so
usr/lib/*/qt5/plugins/kf5/kded/remotenotifier.so
usr/lib/*/qt5/plugins/kf5/kio/
+usr/lib/*/qt5/plugins/kf5/kiod/
usr/lib/*/qt5/plugins/kf5/urifilters/
usr/lib/*/qt5/plugins/plasma/kcms/systemsettings/kcm_smb.so
usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_cookies.so
usr/lib/*/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_netpref.so
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/kf5/kcookiejar/domain_info
diff --git a/debian/kio.lintian-overrides b/debian/kio.lintian-overrides
index c139963..2b08ed4 100644
--- a/debian/kio.lintian-overrides
+++ b/debian/kio.lintian-overrides
@@ -1,3 +1,2 @@
kio: binary-without-manpage usr/bin/ktelnetservice5
kio: binary-without-manpage usr/bin/ktrash5
-kio: unknown-locale-code tok
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 10724d5..f1cbdb2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,4 @@ wait_for_a_bit_longer
Disable-flaky-test.patch
Disable-baloo-dependant-tests.patch
#Disable-flaky-test-1.patch
-runtime_build_switch
+runtime_build_switch
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 8832c1b..7185c98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
override_dh_auto_configure:
- dh_auto_configure -- -DBUILD_QCH=ON -DKF6_COMPAT_BUILD=ON
+ dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_RUNTIME_COMPONENTS=OFF -DKF6_COMPAT_BUILD=ON
override_dh_shlibdeps:
dh_shlibdeps $(patsubst %,-p%,$(filter lib%,$(shell dh_listpackages))) -- -xkio
More information about the Neon-commits
mailing list