From e0b7d38f811e402c57f86277493982cda885d805 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 15 Nov 2014 19:55:02 +0000 Subject: [PATCH] removed all upd cruft --- kded/CMakeLists.txt | 1 - kded/kded.upd | 7 ------- kdoctools/CMakeLists.txt | 5 ----- kdoctools/kio_help.upd | 3 --- kdoctools/move_kio_help_cache.sh | 6 ------ kio/CMakeLists.txt | 8 -------- kio/kioslave.upd | 18 ------------------ kio/kssl/ksslcertificatemanager.upd | 5 ----- kio/kssl/ksslcertificatemanager.upd.sh | 2 -- kio/proxytype.pl | 11 ----------- kioslave/http/kcookiejar/CMakeLists.txt | 2 -- kioslave/http/kcookiejar/kcookiescfg.pl | 11 ----------- kioslave/http/kcookiejar/kcookiescfg.upd | 22 ---------------------- 13 files changed, 101 deletions(-) delete mode 100644 kded/kded.upd delete mode 100644 kdoctools/kio_help.upd delete mode 100755 kdoctools/move_kio_help_cache.sh delete mode 100644 kio/kioslave.upd delete mode 100644 kio/kssl/ksslcertificatemanager.upd delete mode 100644 kio/kssl/ksslcertificatemanager.upd.sh delete mode 100755 kio/proxytype.pl delete mode 100755 kioslave/http/kcookiejar/kcookiescfg.pl delete mode 100644 kioslave/http/kcookiejar/kcookiescfg.upd diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt index f1dfc767..3044564e 100644 --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -77,6 +77,5 @@ else (WIN32) install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus ) endif (WIN32) install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) diff --git a/kded/kded.upd b/kded/kded.upd deleted file mode 100644 index 16cd2375..00000000 --- a/kded/kded.upd +++ /dev/null @@ -1,7 +0,0 @@ -# Migrating kdirwatch poll interval from kdedrc to kdeglobals -Id=kde3.0 -File=kdedrc,kdeglobals -Group=General,DirWatch -Key=PollInterval -Key=NFSPollInterval - diff --git a/kdoctools/CMakeLists.txt b/kdoctools/CMakeLists.txt index 3585b956..1901b786 100644 --- a/kdoctools/CMakeLists.txt +++ b/kdoctools/CMakeLists.txt @@ -185,11 +185,6 @@ install( FILES help.protocol ghelp.protocol DESTINATION ${SERVICES_INSTALL_DIR install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/checkXML DESTINATION ${BIN_INSTALL_DIR} ) -if(NOT WIN32) - install( FILES kio_help.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) - install( PROGRAMS move_kio_help_cache.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) -endif(NOT WIN32) - macro(INSTALL_CUSTOMIZE_DIR _expr _directory) FILE(GLOB _file_CUST "${_expr}" ) foreach(_curentfile ${_file_CUST}) diff --git a/kdoctools/kio_help.upd b/kdoctools/kio_help.upd deleted file mode 100644 index 2b83f05e..00000000 --- a/kdoctools/kio_help.upd +++ /dev/null @@ -1,3 +0,0 @@ -# Move kio_help cache from $KDEHOME/share/apps/kio_help/cache to $KDEHOME/cache-$HOST/kio_help -Id=kde3_2 -Script=move_kio_help_cache.sh,sh diff --git a/kdoctools/move_kio_help_cache.sh b/kdoctools/move_kio_help_cache.sh deleted file mode 100755 index 3d781246..00000000 --- a/kdoctools/move_kio_help_cache.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -bas=`kde4-config --localprefix`share/apps/kio_help -mv "$bas/cache" "`kde4-config --path cache`kio_help" -rmdir "$bas" -exit 0 diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt index 44b1b078..f87e418e 100644 --- a/kio/CMakeLists.txt +++ b/kio/CMakeLists.txt @@ -281,10 +281,6 @@ kde4_add_ui_files(kio_LIB_SRCS kssl/certificateparty.ui ) -install(FILES kssl/ksslcertificatemanager.upd - kssl/ksslcertificatemanager.upd.sh - DESTINATION ${DATA_INSTALL_DIR}/kconf_update) - kde4_add_library(kio ${LIBRARY_TYPE} ${kio_LIB_SRCS}) target_link_libraries(kio ${KDE4_KDEUI_LIBS} ${ZLIB_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${X11_LIBRARIES} ${KIO_EXTRA_LIBS}) @@ -306,9 +302,6 @@ set_target_properties(kio PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} ########### install files ############### install(TARGETS kio EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) -install( PROGRAMS useragent.pl proxytype.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) - - install( FILES data.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES application.desktop @@ -325,7 +318,6 @@ install( FILES kfile/kiofilemodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -install( FILES kioslave.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) install( FILES kio/kio_export.h kio/accessmanager.h diff --git a/kio/kioslave.upd b/kio/kioslave.upd deleted file mode 100644 index f1ad015d..00000000 --- a/kio/kioslave.upd +++ /dev/null @@ -1,18 +0,0 @@ -# Hello world -Id=kde2.2/r1 -File=kioslaverc,kio_httprc -Group=Cache Settings, -Key=MaxCacheSize -Key=MaxCacheAge -Key=UseCache -File=kioslaverc -Group=Browser Settings/UserAgent,UserAgent -AllKeys -Id=kde2.2/r2 -File=kioslaverc,kio_httprc -Group=UserAgent -Script=useragent.pl,perl -Id=kde2.2/r3 -File=kioslaverc -Group=Proxy Settings -Script=proxytype.pl,perl diff --git a/kio/kssl/ksslcertificatemanager.upd b/kio/kssl/ksslcertificatemanager.upd deleted file mode 100644 index a798ecd7..00000000 --- a/kio/kssl/ksslcertificatemanager.upd +++ /dev/null @@ -1,5 +0,0 @@ -# KConfigGroup cannot handle arbitrary binary data as group names. -# As fixing this right would be quite hard, and the data is not very valuable, -# we'll simply wipe the config file. -Id=kde4.2 -Script=ksslcertificatemanager.upd.sh,sh diff --git a/kio/kssl/ksslcertificatemanager.upd.sh b/kio/kssl/ksslcertificatemanager.upd.sh deleted file mode 100644 index ea166303..00000000 --- a/kio/kssl/ksslcertificatemanager.upd.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -rm `kde4-config --localprefix`/share/config/ksslcertificatemanager diff --git a/kio/proxytype.pl b/kio/proxytype.pl deleted file mode 100755 index 553db53f..00000000 --- a/kio/proxytype.pl +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/perl -# the script is called with interpreter, so don't worry about the path - -while(<>) -{ - $useproxy = 1 if /UseProxy=true/; - $usepac = 1 if /Proxy Config Script=.*\S/; -} -printf ("# DELETE UseProxy\n"); -$proxytype = $useproxy ? ($usepac ? 2 : 1) : 0; -print "ProxyType=$proxytype\n" if $proxytype; diff --git a/kioslave/http/kcookiejar/CMakeLists.txt b/kioslave/http/kcookiejar/CMakeLists.txt index bc50e441..9db575ff 100644 --- a/kioslave/http/kcookiejar/CMakeLists.txt +++ b/kioslave/http/kcookiejar/CMakeLists.txt @@ -47,8 +47,6 @@ install(TARGETS kded_kcookiejar DESTINATION ${PLUGIN_INSTALL_DIR} ) install( FILES domain_info DESTINATION ${DATA_INSTALL_DIR}/khtml ) install( FILES kcookiejar.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) -install( FILES kcookiescfg.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) -install( PROGRAMS kcookiescfg.pl DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KCookieServer.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) diff --git a/kioslave/http/kcookiejar/kcookiescfg.pl b/kioslave/http/kcookiejar/kcookiescfg.pl deleted file mode 100755 index 7fef01d5..00000000 --- a/kioslave/http/kcookiejar/kcookiescfg.pl +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/perl - -while(<>) { - $treatAllAsSessionCookies = 1 if (/IgnoreExpirationDate=true/); -} - -printf("# DELETE IgnoreExpirationDate\n"); -if ($treatAllAsSessionCookies) { - printf("# DELETE CookieGlobalAdvice\n"); - printf("CookieGlobalAdvice=AcceptForSession\n"); -} diff --git a/kioslave/http/kcookiejar/kcookiescfg.upd b/kioslave/http/kcookiejar/kcookiescfg.upd deleted file mode 100644 index 43f83894..00000000 --- a/kioslave/http/kcookiejar/kcookiescfg.upd +++ /dev/null @@ -1,22 +0,0 @@ -# Update for old cookie config files, if present -Id=kde2.2/b1 -File=kcookiejarrc -Group=Browser Settings/HTTP,Cookie Policy - -# Update cookies config file... -Id=kde3.1/cvs -File=kcookiejarrc -Group=,Cookie Dialog -Key=DefaultRadioButton,PreferredPolicy -Key=ShowCookieDetails -Group=Cookie Policy -Key=AcceptTempCookies,AcceptSessionCookies -Key=AutoAcceptSessionCookies,AcceptSessionCookies -Key=RejectCrossDomain,RejectCrossDomainCookies -Key=IgnoreCookieExpirationDate,IgnoreExpirationDate - -# Update cookies config file... -Id=kde4.10/git -File=kcookiejarrc -Group=Cookie Policy -Script=kcookiescfg.pl,perl