From 11f268b9818ed38b4096daca06c27d1ef898deea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= <git@apitzsch.eu>
Date: Sat, 31 Oct 2020 08:28:32 +0100
Subject: [PATCH] Use reverse-DNS scheme for appdata + desktop

---
 ...ppdata.xml.in => org.gramps_project.Gramps.appdata.xml.in} | 4 ++--
 ...gramps.desktop.in => org.gramps_project.Gramps.desktop.in} | 0
 po/POTFILES.in                                                | 4 ++--
 po/update_po.py                                               | 4 ++--
 setup.py                                                      | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename data/{gramps.appdata.xml.in => org.gramps_project.Gramps.appdata.xml.in} (95%)
 rename data/{gramps.desktop.in => org.gramps_project.Gramps.desktop.in} (100%)

diff --git a/data/gramps.appdata.xml.in b/data/org.gramps_project.Gramps.appdata.xml.in
similarity index 95%
rename from data/gramps.appdata.xml.in
rename to data/org.gramps_project.Gramps.appdata.xml.in
index 1c9532ab9..ba49f2177 100644
--- a/data/gramps.appdata.xml.in
+++ b/data/org.gramps_project.Gramps.appdata.xml.in
@@ -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>
diff --git a/data/gramps.desktop.in b/data/org.gramps_project.Gramps.desktop.in
similarity index 100%
rename from data/gramps.desktop.in
rename to data/org.gramps_project.Gramps.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9aed1efef..d7de89b85 100755
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -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
diff --git a/po/update_po.py b/po/update_po.py
index 22e5a91be..8e3077963 100644
--- a/po/update_po.py
+++ b/po/update_po.py
@@ -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,
diff --git a/setup.py b/setup.py
index 59a47596d..1bb0a5a77 100755
--- a/setup.py
+++ b/setup.py
@@ -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)