Merge branch 'stable' into 0.9

This commit is contained in:
Albert Vaca 2015-09-15 08:34:13 -07:00
commit 274ac99e8f
5 changed files with 25 additions and 2 deletions

View file

@ -52,4 +52,4 @@ add_subdirectory(fileitemactionplugin)
if(BUILD_TESTING) if(BUILD_TESTING)
add_subdirectory(tests) add_subdirectory(tests)
endif() endif()
install(PROGRAMS kdeconnect-non-plasma.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(PROGRAMS org.kde.kdeconnect.nonplasma.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})

View file

@ -25,5 +25,5 @@ target_link_libraries(kcm_kdeconnect
install(TARGETS kcm_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR}) install(TARGETS kcm_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES org.kde.kdeconnect.kcm.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
install(FILES kcm_kdeconnect.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES kcm_kdeconnect.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES kdeconnect.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})

23
kdeconnect.appdata.xml Normal file
View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<component type="desktop">
<id>org.kde.kdeconnect.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license>
<name>KDE Connect</name>
<summary>Seamless connection of your devices</summary>
<description>
<p>KDE Connect provides integration between your Android phone and your desktop.</p>
</description>
<url type="homepage">https://community.kde.org/KDEConnect/</url>
<url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=kdeconnect</url>
<!-- <url type="help">http://docs.kde.org/stable/en/kdeedu/kalgebra/index.html</url> -->
<screenshots>
<screenshot type="default">
<!-- <image>http://kde.org/images/screenshots/kalgebra.png</image> -->
</screenshot>
</screenshots>
<project_group>KDE Connect</project_group>
<provides>
<binary>kdeconnectd</binary>
</provides>
</component>