From c732c747033df8e8665200cf873a8b81499cc104 Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Fri, 22 Jan 2021 15:07:42 +0100 Subject: [PATCH] project: rename to gnome-calls --- .gitlab-ci.yml | 2 +- data/sm.puri.Calls-daemon.desktop.in | 4 ++-- data/sm.puri.Calls.desktop.in | 4 ++-- debian/calls-doc.install | 1 - debian/changelog | 9 +++++++++ debian/control | 10 +++++++--- debian/gnome-calls-doc.install | 1 + debian/{calls.docs => gnome-calls.docs} | 0 debian/{calls.install => gnome-calls.install} | 0 debian/{calls.maintscript => gnome-calls.maintscript} | 0 debian/tests/control | 4 ++-- doc/meson.build | 2 +- meson.build | 2 +- sm.puri.Calls.json | 4 ++-- src/meson.build | 2 +- 15 files changed, 29 insertions(+), 16 deletions(-) delete mode 100644 debian/calls-doc.install create mode 100644 debian/gnome-calls-doc.install rename debian/{calls.docs => gnome-calls.docs} (100%) rename debian/{calls.install => gnome-calls.install} (100%) rename debian/{calls.maintscript => gnome-calls.maintscript} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 971d838..0954079 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,7 +121,7 @@ flatpak:master: variables: MANIFEST_PATH: "sm.puri.Calls.json" RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo" - FLATPAK_MODULE: "calls" + FLATPAK_MODULE: "gnome-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: "" diff --git a/data/sm.puri.Calls-daemon.desktop.in b/data/sm.puri.Calls-daemon.desktop.in index d0d2a63..5d0d9c8 100644 --- a/data/sm.puri.Calls-daemon.desktop.in +++ b/data/sm.puri.Calls-daemon.desktop.in @@ -6,8 +6,8 @@ Comment=A phone dialer and call handler (daemon mode) 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 -TryExec=calls -Exec=calls --daemon +TryExec=gnome-calls +Exec=gnome-calls --daemon Type=Application StartupNotify=true NoDisplay=true diff --git a/data/sm.puri.Calls.desktop.in b/data/sm.puri.Calls.desktop.in index 44697a6..2afb23a 100644 --- a/data/sm.puri.Calls.desktop.in +++ b/data/sm.puri.Calls.desktop.in @@ -6,8 +6,8 @@ Comment=A phone dialer and call handler 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 -TryExec=calls -Exec=calls %u +TryExec=gnome-calls +Exec=gnome-calls %u Type=Application StartupNotify=true Terminal=false diff --git a/debian/calls-doc.install b/debian/calls-doc.install deleted file mode 100644 index 877b1f6..0000000 --- a/debian/calls-doc.install +++ /dev/null @@ -1 +0,0 @@ -/usr/share/gtk-doc/html/calls diff --git a/debian/changelog b/debian/changelog index 896fd39..09ebedd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +gnome-calls (0.3.0~rc1) byzantium; urgency=medium + * UNRELEASED + + [ Evangelos Ribeiro Tzaras] + * rename project files to gnome-calls to be in sync + with Debian packaging + + -- Evangelos Ribeiro Tzaras Thu, 28 Jan 2021 13:59:33 +0100 + calls (0.2.0) amber-phone; urgency=medium [ Adrien Plazas ] diff --git a/debian/control b/debian/control index 1804e63..7ca1ef2 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: calls +Source: gnome-calls Section: comm Priority: optional Maintainer: Julian Sparber @@ -28,7 +28,9 @@ Build-Depends: Standards-Version: 4.1.3 Homepage: https://gitlab.gnome.org/Community/Purism/calls -Package: calls +Package: gnome-calls +Replaces: calls (<< 0.3.0) +Breaks: calls (<< 0.3.0) Architecture: any Depends: ${misc:Depends}, @@ -43,7 +45,9 @@ Description: Make and receive PSTN phone calls It works on desktops but also adjusts to small screen sizes like smart phones and other mobile devices. -Package: calls-doc +Package: gnome-calls-doc +Replaces: calls-doc (<< 0.3.0) +Breaks: calls-doc (<< 0.3.0) Architecture: all Build-Profiles: Depends: diff --git a/debian/gnome-calls-doc.install b/debian/gnome-calls-doc.install new file mode 100644 index 0000000..f5e9d09 --- /dev/null +++ b/debian/gnome-calls-doc.install @@ -0,0 +1 @@ +/usr/share/gtk-doc/html/gnome-calls diff --git a/debian/calls.docs b/debian/gnome-calls.docs similarity index 100% rename from debian/calls.docs rename to debian/gnome-calls.docs diff --git a/debian/calls.install b/debian/gnome-calls.install similarity index 100% rename from debian/calls.install rename to debian/gnome-calls.install diff --git a/debian/calls.maintscript b/debian/gnome-calls.maintscript similarity index 100% rename from debian/calls.maintscript rename to debian/gnome-calls.maintscript diff --git a/debian/tests/control b/debian/tests/control index 19542be..a2daf1f 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,4 +1,4 @@ -Test-Command: xvfb-run /usr/bin/calls --help +Test-Command: xvfb-run /usr/bin/gnome-calls --help Restrictions: superficial -Depends: calls, xauth, xvfb +Depends: gnome-calls, xauth, xvfb diff --git a/doc/meson.build b/doc/meson.build index 674b7ad..68f4ed9 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: 'calls', + install_dir: 'gnome-calls', install: true) endif diff --git a/meson.build b/meson.build index f32e435..72bafe4 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,7 @@ # project( - 'calls', + 'gnome-calls', 'c', 'vala', version: '0.2.0', license: 'GPLv3+', diff --git a/sm.puri.Calls.json b/sm.puri.Calls.json index 1806736..75c1061 100644 --- a/sm.puri.Calls.json +++ b/sm.puri.Calls.json @@ -3,7 +3,7 @@ "runtime" : "org.gnome.Platform", "runtime-version" : "master", "sdk" : "org.gnome.Sdk", - "command" : "calls", + "command" : "gnome-calls", "finish-args" : [ "--share=ipc", "--socket=fallback-x11", @@ -290,7 +290,7 @@ ] }, { - "name" : "calls", + "name" : "gnome-calls", "buildsystem" : "meson", "sources" : [ { diff --git a/src/meson.build b/src/meson.build index 1db1fee..52c3c82 100644 --- a/src/meson.build +++ b/src/meson.build @@ -118,7 +118,7 @@ calls_resources = gnome.compile_resources( ) executable ( - 'calls', + 'gnome-calls', calls_sources, calls_enum_sources, calls_resources, wl_proto_sources, wayland_sources, 'main.c', dependencies : calls_deps,