summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-23 03:09:04 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-07-23 03:09:04 (GMT)
commit843eb5d37f5ecb913b1bd74a9b4a048e031a2e97 (patch)
tree98817c389da83cf3f5eb9512ee9a294ca5f903f5
parentd67eb06fc35d6678e84d5e022a1365c8c7c0af2b (diff)
Use reverse dns naming for appdata/deskop files for KDE Marble app
Also * move appdata file into app folder * install appdata file using KDE_INSTALL_METAINFODIR var CCMAIL:kde-i18n-doc@kde.org
-rw-r--r--CMakeLists.txt1
-rw-r--r--src/apps/marble-kde/CMakeLists.txt7
-rw-r--r--src/apps/marble-kde/org.kde.marble.appdata.xml (renamed from marble.appdata.xml)12
-rw-r--r--src/apps/marble-kde/org.kde.marble.desktop (renamed from src/apps/marble-kde/marble.desktop)0
4 files changed, 8 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e34bf58..7944f28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -295,7 +295,6 @@ endif()
####################################################
# Install extra files
install(FILES LICENSE.txt DESTINATION ${MARBLE_DATA_INSTALL_PATH})
-install(FILES marble.appdata.xml DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/appdata/)
####################################################
# Install CMake module
diff --git a/src/apps/marble-kde/CMakeLists.txt b/src/apps/marble-kde/CMakeLists.txt
index ea2c39f..eb6181b 100644
--- a/src/apps/marble-kde/CMakeLists.txt
+++ b/src/apps/marble-kde/CMakeLists.txt
@@ -67,10 +67,7 @@ if(STATIC_BUILD)
target_link_libraries(marble ${QT_PLUGINS_DIR}/imageformats/qsvg.lib)
endif(STATIC_BUILD)
-if (NOT APPLE)
- install( FILES marble.desktop DESTINATION ${APPS_INSTALL_DIR})
-endif()
-
install(TARGETS marble ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(PROGRAMS marble.desktop DESTINATION ${APPS_INSTALL_DIR})
+install(PROGRAMS org.kde.marble.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(FILES org.kde.marble.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
install(FILES marble.kcfg DESTINATION ${KCFG_INSTALL_DIR})
diff --git a/marble.appdata.xml b/src/apps/marble-kde/org.kde.marble.appdata.xml
index 384107f..a177ef7 100644
--- a/marble.appdata.xml
+++ b/src/apps/marble-kde/org.kde.marble.appdata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component type="desktop">
- <id>marble.desktop</id>
+ <id>org.kde.marble.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>LGPL</project_license>
<name>Marble</name>
@@ -145,14 +145,14 @@
<p xml:lang="x-test">xxStart exploring the world. View clouds and sun shadow, follow satellites and space stations and display their orbits, all updated in real-time. Travel back in time and learn about historic views of our planet using maps from past centuries. Earth is not enough? Marble also offers maps of the moon and other planets.xx</p>
<p xml:lang="zh-TW">開始探索世界吧!檢視雲與太陽的陰影,跟著衛星與太空站顯示的軌道,所有的一切都是即時更新。時光旅行回到過去,看看過去的地圖上的旅程。地球不夠看嗎?Marble 也提供了月球與其他星球的地圖喔!</p>
</description>
- <url type="homepage">http://marble.kde.org/</url>
+ <url type="homepage">https://marble.kde.org/</url>
<url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=marble</url>
- <url type="faq">http://techbase.kde.org/Projects/Marble/FAQ</url>
- <url type="help">http://marble.kde.org/support.php</url>
- <url type="donation">http://www.kde.org/community/donations/</url>
+ <url type="faq">https://techbase.kde.org/Projects/Marble/FAQ</url>
+ <url type="help">https://marble.kde.org/support.php</url>
+ <url type="donation">https://www.kde.org/community/donations/</url>
<screenshots>
<screenshot type="default">
- <image>http://marble.kde.org/img/gallery/marble-desktop-satellite-clouds.png</image>
+ <image>https://marble.kde.org/img/gallery/marble-desktop-satellite-clouds.png</image>
</screenshot>
</screenshots>
<project_group>KDE</project_group>
diff --git a/src/apps/marble-kde/marble.desktop b/src/apps/marble-kde/org.kde.marble.desktop
index f7d3e59..f7d3e59 100644
--- a/src/apps/marble-kde/marble.desktop
+++ b/src/apps/marble-kde/org.kde.marble.desktop