From 3050e306726692938a67f5c0b5e84977258f7be0 Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Wed, 10 Feb 2021 22:18:51 +0100 Subject: [PATCH] project: rename back to calls The project files should not have been renamed in c732c74 as these changes might infringe on GNOME trademarks --- .gitlab-ci.yml | 4 ++-- debian/gnome-calls-doc.install | 2 +- doc/meson.build | 2 +- meson.build | 2 +- sm.puri.Calls.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0954079..d7af9c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,9 +121,9 @@ flatpak:master: variables: MANIFEST_PATH: "sm.puri.Calls.json" RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo" - FLATPAK_MODULE: "gnome-calls" + FLATPAK_MODULE: "calls" # Make sure to keep this in sync with the Flatpak manifest, all arguments # are passed except the config-args because we build it ourselves MESON_ARGS: "" APP_ID: "sm.puri.Calls" - BUNDLE: 'gnome-calls.flatpak' + BUNDLE: 'calls.flatpak' diff --git a/debian/gnome-calls-doc.install b/debian/gnome-calls-doc.install index f5e9d09..877b1f6 100644 --- a/debian/gnome-calls-doc.install +++ b/debian/gnome-calls-doc.install @@ -1 +1 @@ -/usr/share/gtk-doc/html/gnome-calls +/usr/share/gtk-doc/html/calls diff --git a/doc/meson.build b/doc/meson.build index 68f4ed9..674b7ad 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -41,7 +41,7 @@ gnome.gtkdoc('calls', '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gi')), '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gtk3')), ], - install_dir: 'gnome-calls', + install_dir: 'calls', install: true) endif diff --git a/meson.build b/meson.build index 72bafe4..f32e435 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,7 @@ # project( - 'gnome-calls', + 'calls', 'c', 'vala', version: '0.2.0', license: 'GPLv3+', diff --git a/sm.puri.Calls.json b/sm.puri.Calls.json index 75c1061..f380a59 100644 --- a/sm.puri.Calls.json +++ b/sm.puri.Calls.json @@ -290,7 +290,7 @@ ] }, { - "name" : "gnome-calls", + "name" : "calls", "buildsystem" : "meson", "sources" : [ {