Merge pull request #1143 from a-andre/reverseDNS

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>

data/org.gramps_project.Gramps.desktop.in

@@ -3,7 +3,7 @@ Name=Gramps
 GenericName=Genealogy System
 X-GNOME-FullName=Gramps Genealogy System
 Comment=Manage genealogical information, perform genealogical research and analysis
-Icon=gramps
+Icon=org.gramps_project.Gramps
 Terminal=false
 Type=Application
 StartupNotify=true

gramps/gui/grampsgui.py

@@ -677,7 +677,7 @@ from gramps.gen.constfunc import is_quartz
 class GrampsApplication(Gtk.Application):
 
     def __init__(self, errors, argparser):
-        super().__init__(application_id="org.gramps-project.Gramps")
+        super().__init__(application_id="org.gramps_project.Gramps")
         self.window = None
         self.errors = errors
         self.argparser = argparser

po/POTFILES.in

@@ -808,8 +808,8 @@ 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.xml.in
+data/org.gramps_project.Gramps.appdata.xml.in
+data/org.gramps_project.Gramps.desktop.in
 data/holidays.xml
 data/tips.xml

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,

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'),
-                   ('data/gramps.xml', 'share/mime/packages', '--xml'),
-                   ('data/gramps.appdata.xml', 'share/metainfo', '--xml'))
+    merge_files = (('data/org.gramps_project.Gramps.desktop', 'share/applications', '--desktop'),
+                   ('data/org.gramps_project.Gramps.xml', 'share/mime/packages', '--xml'),
+                   ('data/org.gramps_project.Gramps.appdata.xml', 'share/metainfo', '--xml'))
 
     for filename, target, option in merge_files:
         filenamelocal = convert_path(filename)
@@ -372,13 +372,13 @@ data_files_gui.append(('share/gramps/images/hicolor/22x22/actions', ICON_22))
 data_files_gui.append(('share/gramps/images/hicolor/24x24/actions', ICON_24))
 data_files_gui.append(('share/gramps/images/hicolor/48x48/actions', ICON_48))
 data_files_gui.append(('share/gramps/images/hicolor/scalable/actions', ICON_SC))
-APP_16 = os.path.join(THEME, '16x16', 'apps', 'gramps.png')
-APP_22 = os.path.join(THEME, '22x22', 'apps', 'gramps.png')
-APP_24 = os.path.join(THEME, '24x24', 'apps', 'gramps.png')
-APP_48 = os.path.join(THEME, '48x48', 'apps', 'gramps.png')
-APP_128 = os.path.join(THEME, '128x128', 'apps', 'gramps.png')
-APP_256 = os.path.join(THEME, '256x256', 'apps', 'gramps.png')
-APP_SC = os.path.join(THEME, 'scalable', 'apps', 'gramps.svg')
+APP_16 = os.path.join(THEME, '16x16', 'apps', 'org.gramps_project.Gramps.png')
+APP_22 = os.path.join(THEME, '22x22', 'apps', 'org.gramps_project.Gramps.png')
+APP_24 = os.path.join(THEME, '24x24', 'apps', 'org.gramps_project.Gramps.png')
+APP_48 = os.path.join(THEME, '48x48', 'apps', 'org.gramps_project.Gramps.png')
+APP_128 = os.path.join(THEME, '128x128', 'apps', 'org.gramps_project.Gramps.png')
+APP_256 = os.path.join(THEME, '256x256', 'apps', 'org.gramps_project.Gramps.png')
+APP_SC = os.path.join(THEME, 'scalable', 'apps', 'org.gramps_project.Gramps.svg')
 data_files_gui.append(('share/icons/hicolor/16x16/apps', [APP_16]))
 data_files_gui.append(('share/icons/hicolor/22x22/apps', [APP_22]))
 data_files_gui.append(('share/icons/hicolor/24x24/apps', [APP_24]))