summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuigi Toscano <luigi.toscano@tiscali.it>2016-10-14 20:48:30 (GMT)
committerLuigi Toscano <luigi.toscano@tiscali.it>2016-10-16 21:56:04 (GMT)
commit871c53ccd14d05e526117ccd6ee405d9132820fe (patch)
tree74c333ef49c6fd2a511af96c2cc810f0c0b1c82c
parent8c6a0d392280090670c5cddf2c3392a8c79cdd2b (diff)
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: 129184
-rw-r--r--CMakeLists.txt4
-rw-r--r--MANIFEST.in2
-rw-r--r--org.kde.kajongg.appdata.xml (renamed from kajongg.appdata.xml)2
-rwxr-xr-xorg.kde.kajongg.desktop (renamed from kajongg.desktop)0
-rwxr-xr-xsetup.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdbe5b7..86f806c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,8 +116,8 @@ IF(INSTALL_KAJONGG)
PYKDE4_ADD_EXECUTABLE(kajongg.py kajongg)
PYKDE4_ADD_EXECUTABLE(kajonggserver.py kajonggserver)
kde4_install_icons(${ICON_INSTALL_DIR})
- install(PROGRAMS kajongg.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
- install(FILES kajongg.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata)
+ install(PROGRAMS org.kde.kajongg.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ install(FILES org.kde.kajongg.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/metainfo)
ENDIF(INSTALL_KAJONGG)
macro_display_feature_log()
diff --git a/MANIFEST.in b/MANIFEST.in
index 2573ccb..85ef1c1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,7 +7,7 @@ include voices/female1/*
include voices/female2/*
include voices/male1/*
include voices/male2/*
-include kajongg.desktop
+include org.kde.kajongg.desktop
exclude src/*_ui.py
include doc/*.png
include doc/index.docbook
diff --git a/kajongg.appdata.xml b/org.kde.kajongg.appdata.xml
index 8b5edb8..54ad2b1 100644
--- a/kajongg.appdata.xml
+++ b/org.kde.kajongg.appdata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component type="desktop">
- <id>kajongg.desktop</id>
+ <id>org.kde.kajongg.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license>
<name>Kajongg</name>
diff --git a/kajongg.desktop b/org.kde.kajongg.desktop
index 39129aa..39129aa 100755
--- a/kajongg.desktop
+++ b/org.kde.kajongg.desktop
diff --git a/setup.py b/setup.py
index d6ba93f..d29ab98 100755
--- a/setup.py
+++ b/setup.py
@@ -76,7 +76,7 @@ data_files = [ \
(kdeDirs['exe'], ['kajongg','kajonggserver', 'kajonggserver3']),
(os.path.join(kdeDirs['data'], 'kajongg'), app_files),
(os.path.join(kdeDirs['html'], 'en','kajongg'), doc_files),
- (kdeDirs['xdgdata-apps'], ['kajongg.desktop']),
+ (kdeDirs['xdgdata-apps'], ['org.kde.kajongg.desktop']),
('/usr/share/doc/kajongg/', ['COPYING.DOC']),
(kdeDirs['iconApps'], ['kajongg.svgz']),
(kdeDirs['iconActions'], ['games-kajongg-law.svgz'])]