Git commit 843eb5d37f5ecb913b1bd74a9b4a048e031a2e97 by Friedrich W. H. Koss=
ebau.
Committed on 23/07/2016 at 03:09.
Pushed by kossebau into branch 'master'.

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

M  +0    -1    CMakeLists.txt
M  +2    -5    src/apps/marble-kde/CMakeLists.txt
R  +6    -6    src/apps/marble-kde/org.kde.marble.appdata.xml [from: marble=
.appdata.xml - 098% similarity]
R  +0    -0    src/apps/marble-kde/org.kde.marble.desktop [from: src/apps/m=
arble-kde/marble.desktop - 100% similarity]

http://commits.kde.org/marble/843eb5d37f5ecb913b1bd74a9b4a048e031a2e97

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_DATAROOT=
DIR}/appdata/)
 =

 ####################################################
 # Install CMake module
diff --git a/src/apps/marble-kde/CMakeLists.txt b/src/apps/marble-kde/CMake=
Lists.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_METAINF=
ODIR})
 install(FILES marble.kcfg DESTINATION ${KCFG_INSTALL_DIR})
diff --git a/marble.appdata.xml b/src/apps/marble-kde/org.kde.marble.appdat=
a.xml
similarity index 98%
rename from marble.appdata.xml
rename to 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=3D"1.0" encoding=3D"utf-8"?>
 <component type=3D"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=3D"x-test">xxStart exploring the world. View clouds and su=
n shadow, follow satellites and space stations and display their orbits, al=
l 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 a=
lso offers maps of the moon and other planets.xx</p>
     <p xml:lang=3D"zh-TW">=E9=96=8B=E5=A7=8B=E6=8E=A2=E7=B4=A2=E4=B8=96=E7=
=95=8C=E5=90=A7=EF=BC=81=E6=AA=A2=E8=A6=96=E9=9B=B2=E8=88=87=E5=A4=AA=E9=99=
=BD=E7=9A=84=E9=99=B0=E5=BD=B1=EF=BC=8C=E8=B7=9F=E8=91=97=E8=A1=9B=E6=98=9F=
=E8=88=87=E5=A4=AA=E7=A9=BA=E7=AB=99=E9=A1=AF=E7=A4=BA=E7=9A=84=E8=BB=8C=E9=
=81=93=EF=BC=8C=E6=89=80=E6=9C=89=E7=9A=84=E4=B8=80=E5=88=87=E9=83=BD=E6=98=
=AF=E5=8D=B3=E6=99=82=E6=9B=B4=E6=96=B0=E3=80=82=E6=99=82=E5=85=89=E6=97=85=
=E8=A1=8C=E5=9B=9E=E5=88=B0=E9=81=8E=E5=8E=BB=EF=BC=8C=E7=9C=8B=E7=9C=8B=E9=
=81=8E=E5=8E=BB=E7=9A=84=E5=9C=B0=E5=9C=96=E4=B8=8A=E7=9A=84=E6=97=85=E7=A8=
=8B=E3=80=82=E5=9C=B0=E7=90=83=E4=B8=8D=E5=A4=A0=E7=9C=8B=E5=97=8E=EF=BC=9F=
Marble =E4=B9=9F=E6=8F=90=E4=BE=9B=E4=BA=86=E6=9C=88=E7=90=83=E8=88=87=E5=
=85=B6=E4=BB=96=E6=98=9F=E7=90=83=E7=9A=84=E5=9C=B0=E5=9C=96=E5=96=94=EF=BC=
=81</p>
   </description>
-  <url type=3D"homepage">http://marble.kde.org/</url>
+  <url type=3D"homepage">https://marble.kde.org/</url>
   <url type=3D"bugtracker">https://bugs.kde.org/enter_bug.cgi?format=3Dgui=
ded&amp;product=3Dmarble</url>
-  <url type=3D"faq">http://techbase.kde.org/Projects/Marble/FAQ</url>
-  <url type=3D"help">http://marble.kde.org/support.php</url>
-  <url type=3D"donation">http://www.kde.org/community/donations/</url>
+  <url type=3D"faq">https://techbase.kde.org/Projects/Marble/FAQ</url>
+  <url type=3D"help">https://marble.kde.org/support.php</url>
+  <url type=3D"donation">https://www.kde.org/community/donations/</url>
   <screenshots>
     <screenshot type=3D"default">
-      <image>http://marble.kde.org/img/gallery/marble-desktop-satellite-cl=
ouds.png</image>
+      <image>https://marble.kde.org/img/gallery/marble-desktop-satellite-c=
louds.png</image>
     </screenshot>
   </screenshots>
   <project_group>KDE</project_group>
diff --git a/src/apps/marble-kde/marble.desktop b/src/apps/marble-kde/org.k=
de.marble.desktop
similarity index 100%
rename from src/apps/marble-kde/marble.desktop
rename to src/apps/marble-kde/org.kde.marble.desktop