Add kconf_update script for kickoffrc to update renamed .desktop files

Basically all PIM applications moved from foo.desktop to org.kde.foo.desktop in 15.08,
which breaks Kickoff after updating. This adds kconf_update script for each application
to sed-replace the old .desktop name with the new one.

akonadiconsole/CMakeLists.txt

@@ -10,6 +10,8 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 add_definitions( -DQT_NO_CAST_FROM_ASCII )
 add_definitions( -DQT_NO_CAST_TO_ASCII )
 
+add_subdirectory(icons)
+add_subdirectory(kconf_update)
 
 set(akonadiconsole_bin_SRCS
   akonadiconsole_debug.cpp
@@ -115,6 +117,3 @@ target_link_libraries(akonadiconsole_bin
 install(TARGETS akonadiconsole_bin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(PROGRAMS org.kde.akonadiconsole.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES akonadiconsoleui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/akonadiconsole)
-
-add_subdirectory(icons)
-

akonadiconsole/kconf_update/CMakeLists.txt

+install(FILES akonadiconsole.upd
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)
+install(PROGRAMS akonadiconsole-15.08-kickoff.sh
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)

akonadiconsole/kconf_update/akonadiconsole-15.08-kickoff.sh

+#!/bin/sh
+
+sed -i "s/\/akonadiconsole.desktop/\/org.kde.akonadiconsole.desktop/" `kf5-config --path config --locate kickoffrc`

akonadiconsole/kconf_update/akonadiconsole.upd

+Version=5
+
+# Update entry in kickoffrc after the .desktop file has been renamed in 15.08
+Id=akonadiconsole-15.08-kickoff
+Script=akonadiconsole-15.08-kickoff.sh,sh

akregator/CMakeLists.txt

@@ -14,3 +14,4 @@ add_subdirectory(plugins)
 add_subdirectory(configuration)
 add_subdirectory(src)
 add_subdirectory(kontactplugin)
+add_subdirectory(kconf_update)

akregator/kconf_update/CMakeLists.txt

+install(FILES akregator.upd
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)
+install(PROGRAMS akregator-15.08-kickoff.sh
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)

akregator/kconf_update/akregator-15.08-kickoff.sh

+#!/bin/sh
+
+sed -i "s/\/akregator.desktop/\/org.kde.akregator.desktop/" `kf5-config --path config --locate kickoffrc`

akregator/kconf_update/akregator.upd

+Version=5
+
+# Update entry in kickoffrc after the .desktop file has been renamed in 15.08
+Id=akregator-15.08-kickoff
+Script=akregator-15.08-kickoff.sh,sh

blogilo/CMakeLists.txt

@@ -4,3 +4,4 @@ add_definitions( -DQT_NO_CAST_TO_ASCII )
 
 add_subdirectory( src )
 add_subdirectory( icons )
+add_subdirectory(kconf_update)

blogilo/kconf_update/CMakeLists.txt

+install(FILES blogilo.upd
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)
+install(PROGRAMS blogilo-15.08-kickoff.sh
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)

blogilo/kconf_update/blogilo-15.08-kickoff.sh

+#!/bin/sh
+
+sed -i "s/\/blogilo.desktop/\/org.kde.blogilo.desktop/" `kf5-config --path config --locate kickoffrc`

blogilo/kconf_update/blogilo.upd

+Version=5
+
+# Update entry in kickoffrc after the .desktop file has been renamed in 15.08
+Id=blogilo-15.08-kickoff
+Script=blogilo-15.08-kickoff.sh,sh

kaddressbook/CMakeLists.txt

@@ -23,6 +23,9 @@ add_subdirectory(printing)
 if(BUILD_TESTING)
    add_subdirectory(autotests)
 endif()
+add_subdirectory(kontactplugin)
+add_subdirectory(kconf_update)
+
 
 if(KF5Gpgmepp_FOUND)
   add_definitions(-DQGPGME_FOUND)
@@ -209,5 +212,3 @@ install(FILES
 install(FILES data/kaddressbook_themes.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
 
 install(DIRECTORY printing/grantlee/themes/ DESTINATION ${KDE_INSTALL_DATADIR}/kaddressbook/printing/themes/ )
-
-add_subdirectory(kontactplugin)

kaddressbook/kconf_update/CMakeLists.txt

+install(FILES kaddressbook.upd
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)
+install(PROGRAMS kaddressbook-15.08-kickoff.sh
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)

kaddressbook/kconf_update/kaddressbook-15.08-kickoff.sh

+#!/bin/sh
+
+sed -i "s/\/kaddressbook.desktop/\/org.kde.kaddressbook.desktop/" `kf5-config --path config --locate kickoffrc`

kaddressbook/kconf_update/kaddressbook.upd

+Version=5
+
+# Update entry in kickoffrc after the .desktop file has been renamed in 15.08
+Id=kaddressbook-15.08-kickoff
+Script=kaddressbook-15.08-kickoff.sh,sh

kalarm/CMakeLists.txt

@@ -21,7 +21,7 @@ include_directories(
 add_subdirectory(appicons)
 add_subdirectory(pixmaps)
 add_subdirectory(autostart)
-
+add_subdirectory(kconf_update)
 
 ########### next target ###############
 set(libkalarm_SRCS
@@ -174,8 +174,6 @@ install(FILES kalarm.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 install(FILES kalarmconfig.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
 install(FILES kalarmui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kalarm)
 install(FILES org.kde.kalarm.kalarm.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR})
-install(FILES kalarm.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR})
-install(PROGRAMS kalarm-version.pl kalarm-1.2.1-general.pl kalarm-1.9.5-defaults.pl kalarm-2.0.2-general.pl kalarm-2.1.5-general.pl DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR})
 
 ########### KAuth helper ###############
 

kalarm/kconf_update/CMakeLists.txt

+install(FILES kalarm.upd
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)
+install(PROGRAMS kalarm-version.pl
+                 kalarm-1.2.1-general.pl
+                 kalarm-1.9.5-defaults.pl
+                 kalarm-2.0.2-general.pl
+                 kalarm-2.1.5-general.pl
+                 kalarm-15.08-kickoff.sh
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)

kalarm/kconf_update/kalarm-15.08-kickoff.sh

+#!/bin/sh
+
+sed -i "s/\/kalarm.desktop/\/org.kde.kalarm.desktop/" `kf5-config --path config --locate kickoffrc`

kalarm/kalarm.upd → kalarm/kconf_update/kalarm.upd

+Version=5
+
 # KAlarm version 1.9.5
 #
 Id=1.9.5
@@ -77,3 +79,8 @@ Id=2.3.2
 File=kalarmrc
 Group=General
 RemoveKey=Sod
+
+# KAlarm version 15.08
+# Update entry in kickoffrc after the .desktop file has been renamed in 15.08
+Id=kalarm-15.08-kickoff
+Script=kalarm-15.08-kickoff.sh,sh

kleopatra/CMakeLists.txt

@@ -68,6 +68,8 @@ if(BUILD_TESTING)
     add_subdirectory(tests)
 endif()
 
+add_subdirectory(kconf_update)
+
 if(WIN32)
   set(_kleopatra_extra_uiserver_SRCS uiserver/uiserver_win.cpp)
   set(_kleopatra_extra_SRCS utils/gnupg-registry.c selftest/registrycheck.cpp)

kleopatra/kconf_update/CMakeLists.txt

+install(FILES kleopatra.upd
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)
+install(PROGRAMS kleopatra-15.08-kickoff.sh
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)

kleopatra/kconf_update/kleopatra-15.08-kickoff.sh

+#!/bin/sh
+
+sed -i "s/\/kleopatra.desktop/\/org.kde.kleopatra.desktop/" `kf5-config --path config --locate kickoffrc`

kleopatra/kconf_update/kleopatra.upd

+Version=5
+
+# Update entry in kickoffrc after the .desktop file has been renamed in 15.08
+Id=kleopatra-15.08-kickoff
+Script=kleopatra-15.08-kickoff.sh,sh

kmail/CMakeLists.txt

@@ -43,6 +43,9 @@ if (KDEPIM_BUILD_DESKTOP)
 endif()
 add_subdirectory(kcm_kpimidentities)
 
+add_subdirectory(kontactplugin)
+add_subdirectory(kconf_update)
+
 ########### kmailprivate ###############
 
 if (KDEPIM_BUILD_DESKTOP)
@@ -394,5 +397,3 @@ generate_export_header(kmailprivate BASE_NAME kmail)
     ${KDE_INSTALL_KSERVICES5DIR}/ServiceMenus)
 
 endif ()
- 
-add_subdirectory(kontactplugin) 

kmail/kconf_update/CMakeLists.txt

+install(FILES kmail.upd
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)
+install(PROGRAMS kmail-15.08-kickoff.sh
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)

kmail/kconf_update/kmail-15.08-kickoff.sh

+#!/bin/sh
+
+sed -i "s/\/KMail2.desktop/\/org.kde.kmail.desktop/" `kf5-config --path config --locate kickoffrc`

kmail/kconf_update/kmail.upd

+Version=5
+
+# Update entry in kickoffrc after the .desktop file has been renamed in 15.08
+Id=kmail-15.08-kickoff
+Script=kmail-15.08-kickoff.sh,sh

knotes/CMakeLists.txt

 project(knotes)
-add_subdirectory( icons ) 
+
 add_definitions( -DQT_NO_CAST_FROM_ASCII )
 add_definitions( -DQT_NO_CAST_TO_ASCII )
 add_definitions(-DTRANSLATION_DOMAIN=\"knotes\")
 
+add_subdirectory(icons)
+
+if (BUILD_TESTING)
+   add_subdirectory(print/autotests)
+endif()
+
+add_subdirectory(kontactplugin)
+add_subdirectory(kconf_update)
+
+
 ########### next target ###############
 
 set(libknotesprivate_config_lib_SRCS
@@ -115,9 +125,3 @@ install( FILES apps/org.kde.KNotes.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDI
 install( FILES data/knotes_printing_theme.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
 
 install(DIRECTORY print/themes/ DESTINATION ${KDE_INSTALL_DATADIR}/knotes/print/themes )
-
-if (BUILD_TESTING)
-   add_subdirectory(print/autotests)
-endif()
-
-add_subdirectory(kontactplugin)

knotes/kconf_update/CMakeLists.txt

+install(FILES knotes.upd
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)
+install(PROGRAMS knotes-15.08-kickoff.sh
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)

knotes/kconf_update/knotes-15.08-kickoff.sh

+#!/bin/sh
+
+sed -i "s/\/knotes.desktop/\/org.kde.knotes.desktop/" `kf5-config --path config --locate kickoffrc`

knotes/kconf_update/knotes.upd

+Version=5
+
+# Update entry in kickoffrc after the .desktop file has been renamed in 15.08
+Id=knotes-15.08-kickoff
+Script=knotes-15.08-kickoff.sh,sh

kontact/CMakeLists.txt

@@ -4,4 +4,4 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kontact\")
 
 add_subdirectory(plugins)
 add_subdirectory(src)
-
+add_subdirectory(kconf_update)

kontact/kconf_update/CMakeLists.txt

+install(FILES kontact.upd
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)
+install(PROGRAMS kontact-15.08-kickoff.sh
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)

kontact/kconf_update/kontact-15.08-kickoff.sh

+#!/bin/sh
+
+sed -i "s/\/Kontact.desktop/\/org.kde.kontact.desktop/" `kf5-config --path config --locate kickoffrc`

kontact/kconf_update/kontact.upd

+Version=5
+
+# Update entry in kickoffrc after the .desktop file has been renamed in 15.08
+Id=kontact-15.08-kickoff
+Script=kontact-15.08-kickoff.sh,sh

korganizer/CMakeLists.txt

@@ -26,6 +26,9 @@ if(KDEPIM_BUILD_DESKTOP)
   add_subdirectory(plugins)
   add_subdirectory(kcmconfigs)
 endif()
+add_subdirectory(kontactplugin)
+add_subdirectory(views/collectionview)
+add_subdirectory(kconf_update)
 
 set(PERL ${PERL_EXECUTABLE})
 configure_file(
@@ -332,5 +335,3 @@ set(korganizerprivate_LIB_SRCS
   )
 
 endif()
-add_subdirectory(kontactplugin)
-add_subdirectory(views/collectionview)

korganizer/kconf_update/CMakeLists.txt

+install(FILES korganizer.upd
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)
+install(PROGRAMS korganizer-15.08-kickoff.sh
+        DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
+)

korganizer/kconf_update/korganizer-15.08-kickoff.sh

+#!/bin/sh
+
+sed -i "s/\/korganizer.desktop/\/org.kde.korganizer.desktop/" `kf5-config --path config --locate kickoffrc`

korganizer/kconf_update/korganizer.upd

+Version=5
+
+# Update entry in kickoffrc after the .desktop file has been renamed in 15.08
+Id=korganizer-15.08-kickoff
+Script=korganizer-15.08-kickoff.sh,sh