Commit 30ab6fdb authored by Daniel Vrátil's avatar Daniel Vrátil 🤖
Browse files

Merge branch 'Applications/15.08'

parents 7878def5 c67d3cb4
......@@ -19,7 +19,7 @@ include_directories(
add_subdirectory(appicons)
add_subdirectory(pixmaps)
add_subdirectory(autostart)
add_subdirectory(kconf_update)
########### next target ###############
set(libkalarm_SRCS
......@@ -171,8 +171,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 ###############
......
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}
)
#!/bin/sh
sed -i "s/\/kalarm.desktop/\/org.kde.kalarm.desktop/" `kf5-config --path config --locate kickoffrc`
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
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