change app-id to com.github.alexr4535.siglo for flathub

theironrobin · Aug 3, 2021 · 6e44887 · 6e44887
1 parent f394094
commit 6e44887
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -65,8 +65,8 @@ Once the container is running, you can launch the app:
 flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 flatpak install --user flathub org.gnome.Sdk//3.38 org.gnome.Platform//3.38
 
-flatpak-builder --repo=repo --force-clean build-dir/ org.gnome.siglo.json
-flatpak build-bundle ./repo/ siglo.flatpak org.gnome.siglo
+flatpak-builder --repo=repo --force-clean build-dir/ com.github.alexr4535.siglo.json
+flatpak build-bundle ./repo/ siglo.flatpak com.github.alexr4535.siglo
 flatpak install --user ./siglo.flatpak
 ```
 
@@ -79,8 +79,8 @@ sudo dnf install qemu-system-arm qemu-user-static
 flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 flatpak install --user flathub org.gnome.Sdk/aarch64/3.38 org.gnome.Platform/aarch64/3.38
 
-flatpak-builder --arch=aarch64 --repo=repo --force-clean build-dir org.gnome.siglo.json
-flatpak build-bundle --arch=aarch64 ./repo/ siglo.flatpak org.gnome.siglo
+flatpak-builder --arch=aarch64 --repo=repo --force-clean build-dir com.github.alexr4535.siglo.json
+flatpak build-bundle --arch=aarch64 ./repo/ siglo.flatpak com.github.alexr4535.siglo
 ```
 
 Transfer the `siglo.flatpak` file on the PinePhone and install it with the following command:

diff --git a/data/org.gnome.siglo.appdata.xml.in → ...com.github.alexr4535.siglo.appdata.xml.in b/data/org.gnome.siglo.appdata.xml.in → ...com.github.alexr4535.siglo.appdata.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-	<id>org.gnome.siglo.desktop</id>
+	<id>com.github.alexr4535.siglo.desktop</id>
 	<metadata_license>CC0-1.0</metadata_license>
 	<project_license>LicenseRef-proprietary</project_license>
 	<description>

diff --git a/data/org.gnome.siglo.desktop.in → data/com.github.alexr4535.siglo.desktop.in b/data/org.gnome.siglo.desktop.in → data/com.github.alexr4535.siglo.desktop.in
@@ -5,4 +5,4 @@ Terminal=false
 Type=Application
 Categories=GTK;
 StartupNotify=true
-Icon=org.gnome.siglo
+Icon=com.github.alexr4535.siglo
diff --git a/data/org.gnome.siglo.gschema.xml → data/com.github.alexr4535.siglo.gschema.xml b/data/org.gnome.siglo.gschema.xml → data/com.github.alexr4535.siglo.gschema.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist gettext-domain="siglo">
-	<schema id="org.gnome.siglo" path="/org/gnome/siglo/">
+	<schema id="com.github.alexr4535.siglo" path="/com/github/alexr4535/siglo/">
 	</schema>
 </schemalist>
diff --git a/data/icons/org.gnome.siglo.svg → data/icons/com.github.alexr4535.siglo.svg b/data/icons/org.gnome.siglo.svg → data/icons/com.github.alexr4535.siglo.svg
diff --git a/data/meson.build b/data/meson.build
@@ -1,6 +1,6 @@
 desktop_file = i18n.merge_file(
-  input: 'org.gnome.siglo.desktop.in',
-  output: 'org.gnome.siglo.desktop',
+  input: 'com.github.alexr4535.siglo.desktop.in',
+  output: 'com.github.alexr4535.siglo.desktop',
   type: 'desktop',
   po_dir: '../po',
   install: true,
@@ -14,15 +14,15 @@ if desktop_utils.found()
   )
 endif
 
-install_data(join_paths('icons', 'org.gnome.siglo.svg'),
+install_data(join_paths('icons', 'com.github.alexr4535.siglo.svg'),
   install_dir: join_paths(get_option('datadir'), 'icons')
 )
 
 install_data('siglo.service', install_dir: '/etc/systemd/user/')
 
 appstream_file = i18n.merge_file(
-  input: 'org.gnome.siglo.appdata.xml.in',
-  output: 'org.gnome.siglo.appdata.xml',
+  input: 'com.github.alexr4535.siglo.appdata.xml.in',
+  output: 'com.github.alexr4535.siglo.appdata.xml',
   po_dir: '../po',
   install: true,
   install_dir: join_paths(get_option('datadir'), 'appdata')
@@ -35,7 +35,7 @@ if appstream_util.found()
   )
 endif
 
-install_data('org.gnome.siglo.gschema.xml',
+install_data('com.github.alexr4535.siglo.gschema.xml',
   install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
 )
 

diff --git a/org.gnome.siglo.json b/org.gnome.siglo.json
@@ -1,5 +1,5 @@
 {
-    "app-id" : "org.gnome.siglo",
+    "app-id" : "com.github.alexr4535.siglo",
     "runtime" : "org.gnome.Platform",
     "runtime-version" : "3.38",
     "sdk" : "org.gnome.Sdk",

diff --git a/po/POTFILES b/po/POTFILES
@@ -1,6 +1,6 @@
-data/org.gnome.siglo.desktop.in
-data/org.gnome.siglo.appdata.xml.in
-data/org.gnome.siglo.gschema.xml
+data/com.github.alexr4535.siglo.desktop.in
+data/com.github.alexr4535.siglo.appdata.xml.in
+data/com.github.alexr4535.siglo.gschema.xml
 src/window.ui
 src/main.py
 src/window.py

diff --git a/po/nl.po b/po/nl.po
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: nl\n"
 
-#: data/org.gnome.siglo.desktop.in:3
+#: data/com.github.alexr4535.siglo.desktop.in:3
 msgid "Siglo"
 msgstr "Siglo"
 

diff --git a/src/main.py b/src/main.py
@@ -14,7 +14,7 @@ def __init__(self):
         self.conf = config()
         self.conf.load_defaults()
         super().__init__(
-            application_id="org.gnome.siglo", flags=Gio.ApplicationFlags.FLAGS_NONE
+            application_id="com.github.alexr4535.siglo", flags=Gio.ApplicationFlags.FLAGS_NONE
         )
 
     def do_activate(self):

diff --git a/src/siglo.gresource.xml b/src/siglo.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/siglo">
+  <gresource prefix="/com/github/alexr4535/siglo">
     <file>window.ui</file>
     <file>watch.svg</file>
     <file>watch-icon.svg</file>

diff --git a/src/window.py b/src/window.py
@@ -39,7 +39,7 @@ def data_received(self):
         GLib.idle_add(self.callback, [firmware, battery])
 
 
-@Gtk.Template(resource_path="/org/gnome/siglo/window.ui")
+@Gtk.Template(resource_path="/com/github/alexr4535/siglo/window.ui")
 class SigloWindow(Gtk.ApplicationWindow):
     __gtype_name__ = "SigloWindow"
     # Navigation
@@ -117,7 +117,7 @@ def make_watch_row(self, name, mac):
         grid.set_margin_right(8)
         row.add(grid)
 
-        icon = Gtk.Image.new_from_resource("/org/gnome/siglo/watch-icon.svg")
+        icon = Gtk.Image.new_from_resource("/com/github/alexr4535/siglo/watch-icon.svg")
         grid.attach(icon, 0, 0, 1, 2)
 
         label_alias = Gtk.Label(label="Name", xalign=1.0)

diff --git a/src/window.ui b/src/window.ui
@@ -72,7 +72,7 @@
               <object class="GtkImage">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="resource">/org/gnome/siglo/watch.svg</property>
+                <property name="resource">/com/github/alexr4535/siglo/watch.svg</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -130,7 +130,7 @@
               <object class="GtkImage">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="resource">/org/gnome/siglo/watch-error.svg</property>
+                <property name="resource">/com/github/alexr4535/siglo/watch-error.svg</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -348,7 +348,7 @@
                                   <object class="GtkImage">
                                     <property name="visible">True</property>
                                     <property name="can-focus">False</property>
-                                    <property name="resource">/org/gnome/siglo/watch-icon.svg</property>
+                                    <property name="resource">/com/github/alexr4535/siglo/watch-icon.svg</property>
                                   </object>
                                   <packing>
                                     <property name="left-attach">0</property>
@@ -787,7 +787,7 @@
                       <object class="GtkImage" id="firmware_picture1">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="resource">/org/gnome/siglo/watch-error.svg</property>
+                        <property name="resource">/com/github/alexr4535/siglo/watch-error.svg</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -840,7 +840,7 @@
                       <object class="GtkImage" id="firmware_picture">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="resource">/org/gnome/siglo/watch-progress.svg</property>
+                        <property name="resource">/com/github/alexr4535/siglo/watch-progress.svg</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -906,7 +906,7 @@
                       <object class="GtkImage" id="firmware_picture2">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="resource">/org/gnome/siglo/watch-check.svg</property>
+                        <property name="resource">/com/github/alexr4535/siglo/watch-check.svg</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>