Use reverse-DNS scheme for appdata + desktop

This commit is contained in:
André Apitzsch 2020-10-31 08:28:32 +01:00 committed by Nick Hall
parent 79cc1970ad
commit 11f268b981
5 changed files with 8 additions and 8 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
<id>org.gramps.gramps</id>
<id>org.gramps_project.Gramps</id>
<name>Gramps</name>
<summary>Manage genealogical information, perform genealogical research and analysis</summary>
<description>
@ -36,7 +36,7 @@
</screenshot>
</screenshots>
<launchable type="desktop-id">gramps.desktop</launchable>
<launchable type="desktop-id">org.gramps_project.Gramps.desktop</launchable>
<provides>
<binary>gramps</binary>
</provides>

View File

@ -809,7 +809,7 @@ gramps/plugins/webstuff/webstuff.py
# Files to extract from and then merge into
#
data/gramps.xml.in
data/gramps.appdata.xml.in
data/gramps.desktop.in
data/org.gramps_project.Gramps.appdata.xml.in
data/org.gramps_project.Gramps.desktop.in
data/holidays.xml
data/tips.xml

View File

@ -313,8 +313,8 @@ def extract_xml():
for input_file in ['../data/holidays.xml',
'../data/tips.xml',
'../data/gramps.xml.in',
'../data/gramps.appdata.xml.in',
'../data/gramps.desktop.in']:
'../data/org.gramps_project.Gramps.appdata.xml.in',
'../data/org.gramps_project.Gramps.desktop.in']:
os.system(('GETTEXTDATADIR=. %(xgettext)s -F -j '
'-o gramps.pot --from-code=UTF-8 %(inputfile)s')
% {'xgettext': xgettextCmd,

View File

@ -163,9 +163,9 @@ def build_intl(build_cmd):
data_files = build_cmd.distribution.data_files
base = build_cmd.build_base
merge_files = (('data/gramps.desktop', 'share/applications', '--desktop'),
merge_files = (('data/org.gramps_project.Gramps.desktop', 'share/applications', '--desktop'),
('data/gramps.xml', 'share/mime/packages', '--xml'),
('data/gramps.appdata.xml', 'share/metainfo', '--xml'))
('data/org.gramps_project.Gramps.appdata.xml', 'share/metainfo', '--xml'))
for filename, target, option in merge_files:
filenamelocal = convert_path(filename)