From 22e0ac2baf0975a1dabbfa7892f8c52c38990235 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <luigi.toscano@tiscali.it>
Date: Sun, 16 Oct 2016 16:11:27 +0200
Subject: [PATCH 41/47] Add namespace to desktop and appdata files

- add the organization namespace to the desktop and then appdata files,
  according the specification;
- use the new directory for metadata (metainfo) files.

REVIEW: 129192
---
 src/CMakeLists.txt                                                  | 6 +++---
 src/dbus/mpris2/MediaPlayer2.cpp                                    | 2 +-
 src/{amarok.appdata.xml => org.kde.amarok.appdata.xml}              | 2 +-
 src/{amarok.desktop => org.kde.amarok.desktop}                      | 0
 ...{amarok_containers.desktop => org.kde.amarok_containers.desktop} | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{amarok.appdata.xml => org.kde.amarok.appdata.xml} (99%)
 rename src/{amarok.desktop => org.kde.amarok.desktop} (100%)
 rename src/{amarok_containers.desktop => org.kde.amarok_containers.desktop} (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 327ec10..827db36 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -948,9 +948,9 @@ install(TARGETS amarok ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
 
-install(PROGRAMS amarok.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install(PROGRAMS amarok_containers.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install(FILES amarok.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata)
+install(PROGRAMS org.kde.amarok.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install(PROGRAMS org.kde.amarok_containers.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install(FILES org.kde.amarok.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/metainfo)
 
 install(FILES amarok_plugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
 install(FILES amarok_codecinstall.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
diff --git a/src/dbus/mpris2/MediaPlayer2.cpp b/src/dbus/mpris2/MediaPlayer2.cpp
index a1d1bda..1f00827 100644
--- a/src/dbus/mpris2/MediaPlayer2.cpp
+++ b/src/dbus/mpris2/MediaPlayer2.cpp
@@ -94,7 +94,7 @@ QString MediaPlayer2::Identity() const
 
 QString MediaPlayer2::DesktopEntry() const
 {
-    return QLatin1String("amarok");
+    return QLatin1String("org.kde.amarok");
 }
 
 QStringList MediaPlayer2::SupportedUriSchemes() const
diff --git a/src/amarok.appdata.xml b/src/org.kde.amarok.appdata.xml
similarity index 99%
rename from src/amarok.appdata.xml
rename to src/org.kde.amarok.appdata.xml
index 809e42c..ff06fc7 100644
--- a/src/amarok.appdata.xml
+++ b/src/org.kde.amarok.appdata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component type="desktop">
-  <id>amarok.desktop</id>
+  <id>org.kde.amarok.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <name>Amarok</name>
   <name xml:lang="ar">أماروك</name>
diff --git a/src/amarok.desktop b/src/org.kde.amarok.desktop
similarity index 100%
rename from src/amarok.desktop
rename to src/org.kde.amarok.desktop
diff --git a/src/amarok_containers.desktop b/src/org.kde.amarok_containers.desktop
similarity index 100%
rename from src/amarok_containers.desktop
rename to src/org.kde.amarok_containers.desktop
-- 
2.9.3