Commit fac9aa7d authored by Jonathan Riddell's avatar Jonathan Riddell 🏄
Browse files

rename kioslave files for co-installability

ktrash -> ktrash5 (I'm not aware of anything which uses this binary)
network.xml -> kf5_network.xml
org.kde.network.kioslavenotifier.xml -> kf5_org.kde.network.kioslavenotifier.xml (I don't know what uses this but I assume something must and will need updated)
documentation -> kioslave5 directory (same as git:kio)
REVIEW:117859
parent a24dde26
......@@ -7,6 +7,6 @@ output=filesystem
listing=Name,Type,Size,Date,Access,Owner,Group,Link
reading=true
source=true
X-DocPath=kioslave/tar/index.html
X-DocPath=kioslave5/tar/index.html
Icon=package-x-generic
Class=:local
......@@ -4,6 +4,6 @@ protocol=bookmarks
input=none
output=stream
reading=true
X-DocPath=kioslave/bookmarks/index.html
X-DocPath=kioslave5/bookmarks/index.html
Icon=bookmarks
Class=:local
......@@ -4,5 +4,5 @@ protocol=cgi
input=none
output=filesystem
reading=true
X-DocPath=kioslave/cgi/index.html
X-DocPath=kioslave5/cgi/index.html
Icon=text-html
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/bookmarks)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/bookmarks)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/bzip2)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/bzip2)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/cgi)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/cgi)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/finger)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/finger)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/fish)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/fish)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/floppy)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/floppy)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/gzip)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/gzip)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/info)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/info)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/man)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/man)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/network)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/network)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/nfs)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/nfs)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/sftp)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/sftp)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/smb)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/smb)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/tar)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/tar)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/thumbnail)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/thumbnail)
########### install files ###############
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave/xz)
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kioslave5/xz)
......@@ -7,5 +7,5 @@ input=stream
output=stream
reading=true
source=false
X-DocPath=kioslave/bzip2/index.html
X-DocPath=kioslave5/bzip2/index.html
Icon=package-x-generic
......@@ -7,5 +7,5 @@ input=stream
output=stream
reading=true
source=false
X-DocPath=kioslave/bzip2/index.html
X-DocPath=kioslave5/bzip2/index.html
Icon=package-x-generic
......@@ -7,5 +7,5 @@ input=stream
output=stream
reading=true
source=false
X-DocPath=kioslave/gzip/index.html
X-DocPath=kioslave5/gzip/index.html
Icon=package-x-generic
......@@ -7,5 +7,5 @@ input=stream
output=stream
reading=true
source=false
X-DocPath=kioslave/xz/index.html
X-DocPath=kioslave5/xz/index.html
Icon=package-x-generic
......@@ -7,5 +7,5 @@ input=stream
output=stream
reading=true
source=false
X-DocPath=kioslave/xz/index.html
X-DocPath=kioslave5/xz/index.html
Icon=package-x-generic
......@@ -5,5 +5,5 @@ input=none
output=stream
reading=true
defaultMimetype=text/html
X-DocPath=kioslave/finger/index.html
X-DocPath=kioslave5/finger/index.html
Icon=user-identity
......@@ -102,4 +102,4 @@ Description[wa]=On vårlet d' I/R pol protocole FISH
Description[x-test]=xxA kioslave for the FISH protocolxx
Description[zh_CN]=FISH 协议的 KIO slave
Description[zh_TW]=用於 FISH 通訊協定的 kioslave
X-DocPath=kioslave/fish/index.html
X-DocPath=kioslave5/fish/index.html
......@@ -10,5 +10,5 @@ makedir=true
deleting=true
moving=true
Icon=media-floppy
X-DocPath=kioslave/floppy/index.html
X-DocPath=kioslave5/floppy/index.html
Class=:local
......@@ -6,6 +6,6 @@ output=filesystem
reading=true
defaultMimetype=text/html
determineMimetypeFromExtension=false
X-DocPath=kioslave/info/index.html
X-DocPath=kioslave5/info/index.html
Icon=help-contents
Class=:local
......@@ -29,4 +29,3 @@ install(TARGETS kurisearchfilter DESTINATION ${PLUGIN_INSTALL_DIR})
install( FILES kuriikwsfilter.desktop kurisearchfilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES searchprovider.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES kuriikwsfilter.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
Id=post-kde3.1/cvs
File=kuriikwsfilterrc
Group=General
Key=SearchEngineShortcutsEnabled,EnableWebShortcuts
Key=InternetKeywordsSearchFallback,DefaultSearchEngine
RemoveKey=InternetKeywordsEnabled
RemoveKey=InternetKeywordsSelectedEngine
Id=pre-kde4.9
File=kuriikwsfilterrc
Group=General
Key=DefaultSearchEngine,DefaultWebShortcut
Key=FavoriteSearchEngines,PreferredWebShortcuts
Key=UseSelectedProvidersOnly,UsePreferredWebShortcutsOnly
\ No newline at end of file
......@@ -7,7 +7,7 @@ reading=true
listing=Name
defaultMimetype=text/html
determineMimetypeFromExtension=false
X-DocPath=kioslave/man/index.html
X-DocPath=kioslave5/man/index.html
maxInstances=10
Icon=help-contents
Class=:local
......@@ -19,4 +19,4 @@ target_link_libraries( kded_networkwatcher KF5::DBusAddons KF5::KIOCore molletne
install( TARGETS kded_networkwatcher DESTINATION ${PLUGIN_INSTALL_DIR} )
install( FILES networkwatcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
install( FILES org.kde.network.kioslavenotifier.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
install( FILES org.kde.network.kioslavenotifier.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} RENAME kf5_org.kde.network.kioslavenotifier.xml )
......@@ -2,5 +2,5 @@
set( SHARED_MIME_INFO_MINIMUM_VERSION "0.40" )
find_package( SharedMimeInfo REQUIRED )
install( FILES network.xml DESTINATION ${XDG_MIME_INSTALL_DIR} )
install( FILES network.xml DESTINATION ${XDG_MIME_INSTALL_DIR} RENAME kf5_network.xml )
update_xdg_mimetypes( ${XDG_MIME_INSTALL_DIR} )
......@@ -10,7 +10,7 @@ makedir=true
deleting=true
linking=true
moving=true
X-DocPath=kioslave/nfs/index.html
X-DocPath=kioslave5/nfs/index.html
Icon=folder-remote
Class=:internet
......@@ -105,5 +105,5 @@ Description[wa]=On vårlet d' I/R pol protocole sftp
Description[x-test]=xxA kioslave for sftpxx
Description[zh_CN]=sftp 的 KIO slave
Description[zh_TW]=sftp 的 kioslave
X-DocPath=kioslave/sftp/index.html
X-DocPath=kioslave5/sftp/index.html
Class=:internet
......@@ -14,5 +14,5 @@ copyToFile=true
copyFromFile=true
maxInstances=20
maxInstancesPerHost=5
X-DocPath=kioslave/smb/index.html
X-DocPath=kioslave5/smb/index.html
Icon=network-workgroup
......@@ -5,5 +5,5 @@ input=stream
output=stream
reading=true
source=false
X-DocPath=kioslave/thumbnail/index.html
X-DocPath=kioslave5/thumbnail/index.html
Icon=view-preview
......@@ -39,16 +39,16 @@ install(TARGETS kio_trash DESTINATION ${PLUGIN_INSTALL_DIR} )
set(ktrash_SRCS ktrash.cpp )
add_executable(ktrash ${ktrash_SRCS})
ecm_mark_nongui_executable(ktrash)
add_executable(ktrash5 ${ktrash_SRCS})
ecm_mark_nongui_executable(ktrash5)
target_link_libraries(ktrash
target_link_libraries(ktrash5
KF5::KDE4Support
KF5::KIOCore
KF5::I18n KF5::ConfigCore KF5::ConfigGui
)
install(TARGETS ktrash ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS ktrash5 ${INSTALL_TARGETS_DEFAULT_ARGS})
########### next target ###############
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment