From 7224998a1cb463b79c23c47f8e73b6da7380ca35 Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Sat, 10 Jul 2021 04:34:23 +0200 Subject: [PATCH] project: Use org.gnome prefix in app id and adapt to changes In preparation to moving to GNOME all the IDs, DBus object paths, etc should change. Closes #303 --- .gitlab-ci.yml | 4 ++-- data/meson.build | 20 +++++++++---------- ...p.in => org.gnome.Calls-daemon.desktop.in} | 2 +- ...bolic.svg => org.gnome.Calls-symbolic.svg} | 0 ....desktop.in => org.gnome.Calls.desktop.in} | 2 +- ...ainfo.xml => org.gnome.Calls.metainfo.xml} | 2 +- ...{sm.puri.Calls.svg => org.gnome.Calls.svg} | 2 +- meson.build | 2 +- sm.puri.Calls.json => org.gnome.Calls.json | 2 +- po/POTFILES.in | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) rename data/{sm.puri.Calls-daemon.desktop.in => org.gnome.Calls-daemon.desktop.in} (96%) rename data/{sm.puri.Calls-symbolic.svg => org.gnome.Calls-symbolic.svg} (100%) rename data/{sm.puri.Calls.desktop.in => org.gnome.Calls.desktop.in} (96%) rename data/{sm.puri.Calls.metainfo.xml => org.gnome.Calls.metainfo.xml} (99%) rename data/{sm.puri.Calls.svg => org.gnome.Calls.svg} (99%) rename sm.puri.Calls.json => org.gnome.Calls.json (99%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cbd846b..e713cda 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,9 +134,9 @@ flatpak:master: extends: .flatpak stage: package variables: - MANIFEST_PATH: "sm.puri.Calls.json" + MANIFEST_PATH: "org.gnome.Calls.json" RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo" FLATPAK_MODULE: "calls" MESON_ARGS: "" - APP_ID: "sm.puri.Calls" + APP_ID: "org.gnome.Calls" BUNDLE: "calls.flatpak" diff --git a/data/meson.build b/data/meson.build index 5cdfeab..9aef3cf 100644 --- a/data/meson.build +++ b/data/meson.build @@ -3,8 +3,8 @@ sysconfdir = get_option('sysconfdir') # Desktop file desktop_file = i18n.merge_file( - input : 'sm.puri.Calls.desktop.in', - output : 'sm.puri.Calls.desktop', + input : 'org.gnome.Calls.desktop.in', + output : 'org.gnome.Calls.desktop', type : 'desktop', po_dir : '../po', install : true, @@ -12,8 +12,8 @@ desktop_file = i18n.merge_file( ) desktop_file = i18n.merge_file( - input : 'sm.puri.Calls-daemon.desktop.in', - output : 'sm.puri.Calls-daemon.desktop', + input : 'org.gnome.Calls-daemon.desktop.in', + output : 'org.gnome.Calls-daemon.desktop', type : 'desktop', po_dir : '../po', install : true, @@ -24,16 +24,16 @@ desktop_utils = find_program('desktop-file-validate', required: false) if desktop_utils.found() test('Validate desktop file', desktop_utils, args: [join_paths(meson.current_build_dir(), - 'sm.puri.Calls.desktop') + 'org.gnome.Calls.desktop') ]) test('Validate daemon desktop file', desktop_utils, args: [join_paths(meson.current_build_dir(), - 'sm.puri.Calls-daemon.desktop') + 'org.gnome.Calls-daemon.desktop') ]) endif # Metainfo file -install_data('sm.puri.Calls.metainfo.xml', +install_data('org.gnome.Calls.metainfo.xml', install_dir: join_paths(datadir, 'metainfo'), ) @@ -42,13 +42,13 @@ if appstream_util.found() test('Validate appstream file', appstream_util, args: ['validate-relax', join_paths(meson.current_source_dir(), - 'sm.puri.Calls.metainfo.xml') + 'org.gnome.Calls.metainfo.xml') ]) endif # Icons install_data( - 'sm.puri.Calls.svg', + 'org.gnome.Calls.svg', install_dir: join_paths( datadir, 'icons', @@ -58,7 +58,7 @@ install_data( ) ) install_data( - 'sm.puri.Calls-symbolic.svg', + 'org.gnome.Calls-symbolic.svg', install_dir: join_paths( datadir, 'icons', diff --git a/data/sm.puri.Calls-daemon.desktop.in b/data/org.gnome.Calls-daemon.desktop.in similarity index 96% rename from data/sm.puri.Calls-daemon.desktop.in rename to data/org.gnome.Calls-daemon.desktop.in index 5d0d9c8..78dd32e 100644 --- a/data/sm.puri.Calls-daemon.desktop.in +++ b/data/org.gnome.Calls-daemon.desktop.in @@ -5,7 +5,7 @@ Comment=A phone dialer and call handler (daemon mode) # Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon. Keywords=Telephone;Call;Phone;Dial;Dialer;PSTN; # Translators: Do NOT translate or transliterate this text (this is an icon file name)! -Icon=sm.puri.Calls +Icon=org.gnome.Calls TryExec=gnome-calls Exec=gnome-calls --daemon Type=Application diff --git a/data/sm.puri.Calls-symbolic.svg b/data/org.gnome.Calls-symbolic.svg similarity index 100% rename from data/sm.puri.Calls-symbolic.svg rename to data/org.gnome.Calls-symbolic.svg diff --git a/data/sm.puri.Calls.desktop.in b/data/org.gnome.Calls.desktop.in similarity index 96% rename from data/sm.puri.Calls.desktop.in rename to data/org.gnome.Calls.desktop.in index 463e767..f84ae13 100644 --- a/data/sm.puri.Calls.desktop.in +++ b/data/org.gnome.Calls.desktop.in @@ -5,7 +5,7 @@ Comment=A phone dialer and call handler # Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon. Keywords=Telephone;Call;Phone;Dial;Dialer;PSTN; # Translators: Do NOT translate or transliterate this text (this is an icon file name)! -Icon=sm.puri.Calls +Icon=org.gnome.Calls TryExec=gnome-calls Exec=gnome-calls %u Type=Application diff --git a/data/sm.puri.Calls.metainfo.xml b/data/org.gnome.Calls.metainfo.xml similarity index 99% rename from data/sm.puri.Calls.metainfo.xml rename to data/org.gnome.Calls.metainfo.xml index a19f588..8524971 100644 --- a/data/sm.puri.Calls.metainfo.xml +++ b/data/org.gnome.Calls.metainfo.xml @@ -1,6 +1,6 @@ - sm.puri.Calls + org.gnome.Calls CC0-1.0 GPL-3.0+ Calls diff --git a/data/sm.puri.Calls.svg b/data/org.gnome.Calls.svg similarity index 99% rename from data/sm.puri.Calls.svg rename to data/org.gnome.Calls.svg index b44fbe4..a209143 100644 --- a/data/sm.puri.Calls.svg +++ b/data/org.gnome.Calls.svg @@ -18,7 +18,7 @@ id="svg11300" sodipodi:version="0.32" inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="sm.puri.Calls.svg" + sodipodi:docname="org.gnome.Calls.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.0" style="display:inline;enable-background:new" diff --git a/meson.build b/meson.build index a9122a4..fa9bc61 100644 --- a/meson.build +++ b/meson.build @@ -32,7 +32,7 @@ project( ] ) -calls_id = 'sm.puri.Calls' +calls_id = 'org.gnome.Calls' calls_homepage = 'https://gitlab.gnome.org/GNOME/calls' calls_name = meson.project_name() calls_version = meson.project_version() diff --git a/sm.puri.Calls.json b/org.gnome.Calls.json similarity index 99% rename from sm.puri.Calls.json rename to org.gnome.Calls.json index c7d4ef1..4eb4e7d 100644 --- a/sm.puri.Calls.json +++ b/org.gnome.Calls.json @@ -1,5 +1,5 @@ { - "app-id" : "sm.puri.Calls", + "app-id" : "org.gnome.Calls", "runtime" : "org.gnome.Platform", "runtime-version" : "master", "sdk" : "org.gnome.Sdk", diff --git a/po/POTFILES.in b/po/POTFILES.in index 595a7f3..d606a2a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,5 @@ -data/sm.puri.Calls.desktop.in -data/sm.puri.Calls-daemon.desktop.in +data/org.gnome.Calls.desktop.in +data/org.gnome.Calls-daemon.desktop.in src/calls-application.c src/calls-best-match.c src/calls-call.c