1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2024-12-04 20:07:36 +00:00

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
This commit is contained in:
Evangelos Ribeiro Tzaras 2021-07-10 04:34:23 +02:00 committed by Evangelos Ribeiro Tzaras
parent 69b919d7ab
commit 7224998a1c
10 changed files with 20 additions and 20 deletions

View file

@ -134,9 +134,9 @@ flatpak:master:
extends: .flatpak extends: .flatpak
stage: package stage: package
variables: variables:
MANIFEST_PATH: "sm.puri.Calls.json" MANIFEST_PATH: "org.gnome.Calls.json"
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo" RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
FLATPAK_MODULE: "calls" FLATPAK_MODULE: "calls"
MESON_ARGS: "" MESON_ARGS: ""
APP_ID: "sm.puri.Calls" APP_ID: "org.gnome.Calls"
BUNDLE: "calls.flatpak" BUNDLE: "calls.flatpak"

View file

@ -3,8 +3,8 @@ sysconfdir = get_option('sysconfdir')
# Desktop file # Desktop file
desktop_file = i18n.merge_file( desktop_file = i18n.merge_file(
input : 'sm.puri.Calls.desktop.in', input : 'org.gnome.Calls.desktop.in',
output : 'sm.puri.Calls.desktop', output : 'org.gnome.Calls.desktop',
type : 'desktop', type : 'desktop',
po_dir : '../po', po_dir : '../po',
install : true, install : true,
@ -12,8 +12,8 @@ desktop_file = i18n.merge_file(
) )
desktop_file = i18n.merge_file( desktop_file = i18n.merge_file(
input : 'sm.puri.Calls-daemon.desktop.in', input : 'org.gnome.Calls-daemon.desktop.in',
output : 'sm.puri.Calls-daemon.desktop', output : 'org.gnome.Calls-daemon.desktop',
type : 'desktop', type : 'desktop',
po_dir : '../po', po_dir : '../po',
install : true, install : true,
@ -24,16 +24,16 @@ desktop_utils = find_program('desktop-file-validate', required: false)
if desktop_utils.found() if desktop_utils.found()
test('Validate desktop file', desktop_utils, test('Validate desktop file', desktop_utils,
args: [join_paths(meson.current_build_dir(), args: [join_paths(meson.current_build_dir(),
'sm.puri.Calls.desktop') 'org.gnome.Calls.desktop')
]) ])
test('Validate daemon desktop file', desktop_utils, test('Validate daemon desktop file', desktop_utils,
args: [join_paths(meson.current_build_dir(), args: [join_paths(meson.current_build_dir(),
'sm.puri.Calls-daemon.desktop') 'org.gnome.Calls-daemon.desktop')
]) ])
endif endif
# Metainfo file # Metainfo file
install_data('sm.puri.Calls.metainfo.xml', install_data('org.gnome.Calls.metainfo.xml',
install_dir: join_paths(datadir, 'metainfo'), install_dir: join_paths(datadir, 'metainfo'),
) )
@ -42,13 +42,13 @@ if appstream_util.found()
test('Validate appstream file', appstream_util, test('Validate appstream file', appstream_util,
args: ['validate-relax', args: ['validate-relax',
join_paths(meson.current_source_dir(), join_paths(meson.current_source_dir(),
'sm.puri.Calls.metainfo.xml') 'org.gnome.Calls.metainfo.xml')
]) ])
endif endif
# Icons # Icons
install_data( install_data(
'sm.puri.Calls.svg', 'org.gnome.Calls.svg',
install_dir: join_paths( install_dir: join_paths(
datadir, datadir,
'icons', 'icons',
@ -58,7 +58,7 @@ install_data(
) )
) )
install_data( install_data(
'sm.puri.Calls-symbolic.svg', 'org.gnome.Calls-symbolic.svg',
install_dir: join_paths( install_dir: join_paths(
datadir, datadir,
'icons', 'icons',

View file

@ -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. # Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
Keywords=Telephone;Call;Phone;Dial;Dialer;PSTN; Keywords=Telephone;Call;Phone;Dial;Dialer;PSTN;
# Translators: Do NOT translate or transliterate this text (this is an icon file name)! # 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 TryExec=gnome-calls
Exec=gnome-calls --daemon Exec=gnome-calls --daemon
Type=Application Type=Application

View file

Before

Width:  |  Height:  |  Size: 330 B

After

Width:  |  Height:  |  Size: 330 B

View file

@ -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. # Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
Keywords=Telephone;Call;Phone;Dial;Dialer;PSTN; Keywords=Telephone;Call;Phone;Dial;Dialer;PSTN;
# Translators: Do NOT translate or transliterate this text (this is an icon file name)! # 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 TryExec=gnome-calls
Exec=gnome-calls %u Exec=gnome-calls %u
Type=Application Type=Application

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application"> <component type="desktop-application">
<id>sm.puri.Calls</id> <id>org.gnome.Calls</id>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0+</project_license> <project_license>GPL-3.0+</project_license>
<name>Calls</name> <name>Calls</name>

View file

@ -18,7 +18,7 @@
id="svg11300" id="svg11300"
sodipodi:version="0.32" sodipodi:version="0.32"
inkscape:version="0.92.3 (2405546, 2018-03-11)" 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" inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0" version="1.0"
style="display:inline;enable-background:new" style="display:inline;enable-background:new"

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View file

@ -32,7 +32,7 @@ project(
] ]
) )
calls_id = 'sm.puri.Calls' calls_id = 'org.gnome.Calls'
calls_homepage = 'https://gitlab.gnome.org/GNOME/calls' calls_homepage = 'https://gitlab.gnome.org/GNOME/calls'
calls_name = meson.project_name() calls_name = meson.project_name()
calls_version = meson.project_version() calls_version = meson.project_version()

View file

@ -1,5 +1,5 @@
{ {
"app-id" : "sm.puri.Calls", "app-id" : "org.gnome.Calls",
"runtime" : "org.gnome.Platform", "runtime" : "org.gnome.Platform",
"runtime-version" : "master", "runtime-version" : "master",
"sdk" : "org.gnome.Sdk", "sdk" : "org.gnome.Sdk",

View file

@ -1,5 +1,5 @@
data/sm.puri.Calls.desktop.in data/org.gnome.Calls.desktop.in
data/sm.puri.Calls-daemon.desktop.in data/org.gnome.Calls-daemon.desktop.in
src/calls-application.c src/calls-application.c
src/calls-best-match.c src/calls-best-match.c
src/calls-call.c src/calls-call.c