Commit aa7c6b1f authored by Guido Gunther's avatar Guido Gunther
Browse files

Merge branch 'rel_41a' into 'pureos/byzantium'

Document and realse 41~alpha-1pureos1

See merge request Librem5/debs/pkg-calls!14
parents 8d5cabd5 c91d033d
include:
- 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
- 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-byzantium-jobs.yml'
stages:
- build
......@@ -8,6 +7,9 @@ stages:
- package
- test-package
variables:
L5_DOCKER_IMAGE: debian:bullseye
build:native:
stage: build
artifacts:
......@@ -17,17 +19,21 @@ build:native:
COMMON_BUILD_OPTS: -Db_coverage=true --werror
BUILD_OPTS: -Dgtk_doc=true ${COMMON_BUILD_OPTS}
WANT_BUILD_DEPS: "true"
EXP_DEPS: libhandy-1-dev/experimental libhandy-1-0/experimental gir1.2-handy-1/experimental libgladeui-common/experimental
except:
variables:
- $PKG_ONLY == "1"
image: pureos/byzantium
tags:
- librem5
image: debian:bullseye
tags: []
before_script:
- export DEBIAN_FRONTEND=noninteractive
- apt-get -y update
- apt-get -y install lcov
- apt-get -y build-dep .
- apt-get -y install eatmydata
- echo "deb http://deb.debian.org/debian/ experimental main" > /etc/apt/sources.list.d/exp.list
- eatmydata apt-get -y update
- eatmydata apt-get -y install $EXP_DEPS
- eatmydata apt-get -y install lcov
- '[ "${WANT_BUILD_DEPS}" != "true" ] || eatmydata apt-get -y build-dep .'
- ulimit -c unlimited
script:
- 'echo "Build opts: ${BUILD_OPTS}"'
......@@ -72,3 +78,65 @@ check-po:
# in this case
- cd po/
- intltool-update -m 2>&1 | grep -qs '/.*\.c' && { intltool-update -m; exit 1; } || exit 0
package-debian-bullseye:
variables:
EXP_DEPS: libhandy-1-dev/experimental libhandy-1-0/experimental gir1.2-handy-1/experimental libgladeui-common/experimental
tags: []
extends: .l5-build-debian-package
before_script:
- echo "deb http://deb.debian.org/debian/ experimental main" > /etc/apt/sources.list.d/exp.list
- apt-get -y update
- apt-get -y install $EXP_DEPS
package-debian-bullseye:arm64:
variables:
EXP_DEPS: libhandy-1-dev/experimental libhandy-1-0/experimental gir1.2-handy-1/experimental libgladeui-common/experimental
tags:
- aarch64
extends: .l5-build-debian-package
before_script:
- echo "deb http://deb.debian.org/debian/ experimental main" > /etc/apt/sources.list.d/exp.list
- apt-get -y update
- apt-get -y install $EXP_DEPS
# For some reason including https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml fails with a network error (status code 500), therefore it's copied here
.flatpak:
image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
stage: 'package'
interruptible: true
tags:
- flatpak
script:
- rewrite-flatpak-manifest ${MANIFEST_PATH} ${FLATPAK_MODULE} ${CONFIG_OPTS}
- flatpak-builder --user --disable-rofiles-fuse flatpak_app --repo=repo ${BRANCH:+--default-branch=$BRANCH} ${MANIFEST_PATH}
# Generate a Flatpak bundle
- flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APP_ID} ${BRANCH}
- tar cf repo.tar repo/
artifacts:
name: 'Flatpak artifacts'
expose_as: 'Get Flatpak bundle here'
when: 'always'
paths:
- "${BUNDLE}"
- 'repo.tar'
- '.flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/meson-log.txt'
- '.flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/testlog.txt'
expire_in: 14 days
cache:
key: "$CI_JOB_NAME"
paths:
- '.flatpak-builder/downloads'
- '.flatpak-builder/git'
flatpak:master:
extends: .flatpak
stage: package
variables:
MANIFEST_PATH: "org.gnome.Calls.json"
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
FLATPAK_MODULE: "calls"
MESON_ARGS: ""
APP_ID: "org.gnome.Calls"
BUNDLE: "calls.flatpak"
Calls 41.alpha
--------------
Released: July 2021
* Major news items:
- Calls became a part of the GNOME project
* Bugs fixed:
- #283 Cut and ellipsize long labels on the call display
- #288 Does not print 'unknown caller' in notification
- #294 Be consistent with G_LOG_DOMAIN
- #298 flatpak: can't run because schemas are not being found
- #300 Peas prepending search path does not seem to work
- #303 Please move to org.gnome.Calls on DBus
- #304 Sofia 1.13.3 does not include the contact header
* Translation updates:
- Greek, Modern (Efstathios Iosifidis)
- Indonesian (Andika Triwidada)
- Italian (Vittorio Monti)
- Persian (Danial Behzadi)
- Swedish (Luna Jernberg)
- Ukrainian (Yuri Chornoivan)
Calls 0.3.4
-----------
Released: June 2021
* Add support for using multiple provider plugins at the same time
* Expose call objects on DBus
* Add run script to the build directory
* Use stricter warnings for the build
* Translation updates:
- Italian
- Swedish
- Ukrainian
#!/usr/bin/env python3
from os import environ, path
from subprocess import call
# Package managers set this, so we don't need to run
if not environ.get('DESTDIR', ''):
prefix = environ.get('MESON_INSTALL_PREFIX', '/usr/local')
datadir = path.join(prefix, 'share')
print('Updating icon cache...')
call(['gtk-update-icon-cache', '-qtf', path.join(datadir, 'icons', 'hicolor')])
print('Updating desktop database...')
call(['update-desktop-database', path.join(datadir, 'applications')])
print('Compiling schemas...')
call(['glib-compile-schemas', path.join(datadir, 'glib-2.0', 'schemas')])
......@@ -10,28 +10,24 @@
<shortdesc>A phone call dialer</shortdesc>
<description>Calls is a dialer for phone calls, initially PSTN calls
but eventually other systems like SIP in future.</description>
<homepage rdf:resource="https://source.puri.sm/Librem5/calls" />
<homepage rdf:resource="https://gitlab.gnome.org/GNOME/calls" />
<license rdf:resource="http://usefulinc.com/doap/licenses/gpl" />
<programming-language>C</programming-language>
<maintainer>
<foaf:Person>
<foaf:name>Bob Ham</foaf:name>
<foaf:mbox rdf:resource="mailto:bob.ham@puri.sm" />
<foaf:mbox rdf:resource="mailto:rah@settrans.net" />
</foaf:Person>
</maintainer>
<maintainer>
<foaf:Person>
<foaf:name>Julian Sparber</foaf:name>
<foaf:mbox rdf:resource="mailto:julian.sparber@puri.sm" />
<gnome:userid>jsparber</gnome:userid>
</foaf:Person>
</maintainer>
<maintainer>
<foaf:Person>
<foaf:name>Evangelos Ribeiro Tzaras</foaf:name>
<foaf:mbox rdf:resource="mailto:evangelos.tzaras@puri.sm" />
<foaf:mbox rdf:resource="mailto:devrtz@fortysixandtwo.eu" />
<gnome:userid>devrtz</gnome:userid>
</foaf:Person>
</maintainer>
</Project>
......@@ -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',
......@@ -68,9 +68,9 @@ install_data(
)
)
schema_src = 'sm.puri.Calls.gschema.xml'
schema_src = 'org.gnome.Calls.gschema.xml'
compiled = gnome.compile_schemas(build_by_default: true,
depends_files: files(schema_src))
depend_files: files(schema_src))
install_data(schema_src,
install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
......
......@@ -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
......
......@@ -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
......
<?xml version="1.0" encoding="UTF-8"?>
<schemalist gettext-domain="purism-calls">
<schema id="sm.puri.Calls" path="/sm/puri/Calls/">
<schema id="org.gnome.Calls" path="/org/gnome/Calls/">
<key name="auto-use-default-origins" type="b">
<default>true</default>
......@@ -14,5 +14,11 @@
<description>The country code is used for contact name lookup</description>
</key>
<key name="autoload-plugins" type="as">
<default>["mm", "sip"]</default>
<summary>The plugins to load automatically</summary>
<description>These plugins will be automatically loaded on application startup.</description>
</key>
</schema>
</schemalist>
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
<id>sm.puri.Calls</id>
<id>org.gnome.Calls</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0+</project_license>
<name>Calls</name>
......@@ -32,6 +32,8 @@
<mimetypes>
<mimetype>x-scheme-handler/tel</mimetype>
<mimetype>x-scheme-handler/sip</mimetype>
<mimetype>x-scheme-handler/sips</mimetype>
</mimetypes>
<content_rating type="oars-1.1">
......@@ -65,9 +67,9 @@
</content_rating>
<releases>
<release version="0.0.0" date="2018-05-04">
<description>Pre-release development</description>
</release>
<release version="41.alpha" data="2021-07-16">
<description>First GNOME release</description>
</release>
</releases>
<custom>
......
......@@ -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"
......
gnome-calls (41~alpha-0pureos1) byzantium; urgency=medium
* Upload to byzantium
* d/watch: Update for new upstream URL and versioning scheme
* d/control: Update upstream URL
* New upstream version 41~alpha
* d/control: Breaks current phosh
* d/maintscript: Remove old autostart desktop files
* d/copyright: Layer surface got dropped
* d/copyright: Rename files
* d/copyright: Change upstream URL
* d/copyright: Update Upstream Contact
* d/copyright: Update copyright
* d/*.install: Update to reflect renamed file
-- Evangelos Ribeiro Tzaras <evangelos.tzaras@puri.sm> Tue, 10 Aug 2021 15:23:48 +0200
gnome-calls (0.3.4-1pureos2) byzantium; urgency=medium
* d/control: Depend on GTK that connects async to ScreenSaver DBus interface.
......
......@@ -32,7 +32,7 @@ Build-Depends:
xauth,
xvfb,
Standards-Version: 4.5.1
Homepage: https://source.puri.sm/Librem5/calls
Homepage: https://gitlab.gnome.org/GNOME/calls
Vcs-Browser: https://source.puri.sm/Librem5/debs/pkg-calls
Vcs-Git: https://source.puri.sm/Librem5/debs/pkg-calls.git
XSBC-Original-Vcs-Browser: https://salsa.debian.org/DebianOnMobile-team/gnome-calls
......@@ -41,7 +41,8 @@ Rules-Requires-Root: no
Package: gnome-calls
Replaces: calls (<< 0.2.0)
Breaks: calls (<< 0.2.0)
Breaks: calls (<< 0.2.0),
phosh (<< 0.13.0)
Architecture: any
Depends:
callaudiod,
......
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Calls
Upstream-Contact: Julian Sparber <julian.sparber@puri.sm>
Source: https://source.puri.sm/Librem5/calls
Upstream-Contact: Evangelos Ribeiro Tzaras <evangelos.tzaras@puri.sm>
Source: https://gitlab.gnome.org/GNOME/calls
License: GPL-3+
Files: *
Copyright: 2018-2020 Purism SPC
Copyright: 2018-2021 Purism SPC
2018 Mohammed Sadiq <sadiq@sadiqpk.org>
License: GPL-3+
Files: src/wayland/wlr-layer-shell-unstable-v1.xml
Copyright: Copyright © 2017 Drew DeVault
License: X11
Files: data/sm.puri.Calls.metainfo.xml
Files: data/org.gnome.Calls.metainfo.xml
Copyright: 2018 Purism SPC
License: CC0-1.0
Files: data/call-arrow*
data/new-call-symbolic.svg
data/sm.puri.Calls*svg
data/org.gnome.Calls*svg
Copyright: 2019 Purism SPC
2019 GNOME Design Team
License: CC-BY-SA-4.0
......@@ -48,25 +44,6 @@ License: GPL-3+
On Debian systems, the full text of the GNU General Public License version 3
can be found in the file `/usr/share/common-licenses/GPL-3'.
License: X11
Permission to use, copy, modify, distribute, and sell this software and
its documentation for any purpose is hereby granted without fee, provided
that the above copyright notice appear in all copies and fthat both that
copyright notice and this permission notice appear in supporting
documentation, and that the name of the copyright holders not be used in
advertising or publicity pertaining to distribution of the software
without specific, written prior permission. The copyright holders make
no representations about the suitability of this software for any
purpose. It is provided "as is" without express or implied warranty.
.
THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
License: CC0-1.0
Creative Commons Legal Code
.
......
......@@ -5,4 +5,4 @@
/usr/share/icons
/usr/share/locale
/usr/share/metainfo
/usr/share/glib-2.0/schemas/sm.puri.Calls.gschema.xml
/usr/share/glib-2.0/schemas/org.gnome.Calls.gschema.xml
mv_conffile /etc/xdg/autostart/sm.puri.Calls.desktop /etc/xdg/autostart/sm.puri.Calls-daemon.desktop 0.2.0~
rm_conffile /etc/xdg/autostart/sm.puri.Calls.desktop 0.2.0-1~
rm_conffile /etc/xdg/autostart/sm.puri.Calls-daemon.desktop 41~alpha-1~
version=4
opts=filenamemangle=s/.*\/archive\/v(\d\S+)\/calls.*\.tar\.gz/gnome-calls-$1\.tar\.gz/g \
https://source.puri.sm/Librem5/calls/tags?sort=updated_desc .*/archive/v(\d\S+)/.*\.tar\.gz.*
opts=filenamemangle=s/.*\/archive\/(\d\S+)\/calls.*\.tar\.gz/gnome-calls-$1\.tar\.gz/g \
https://gitlab.gnome.org/GNOME/calls/tags?sort=updated_desc .*/archive/(\d\S+)/.*\.tar\.gz.*
......@@ -37,7 +37,7 @@
<chapter id="dbus">
<title>DBus interfaces</title>
<xi:include href="../src/dbus/calls-sm.puri.Calls.Call.xml"/>
<xi:include href="../src/dbus/calls-org.gnome.Calls.Call.xml"/>
</chapter>
</book>
ent_conf = configuration_data()
ent_conf.set('PACKAGE', 'Calls')
ent_conf.set('PACKAGE_BUGREPORT', 'https://source.puri.sm/Librem5/calls/issues')
ent_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/calls/issues')
ent_conf.set('PACKAGE_NAME', 'Calls')
ent_conf.set('PACKAGE_STRING', 'calls')
ent_conf.set('PACKAGE_TARNAME', 'calls-' + meson.project_version())
ent_conf.set('PACKAGE_URL', 'https://source.puri.sm/Librem5/calls')
ent_conf.set('PACKAGE_URL', 'https://gitlab.gnome.org/GNOME/calls')
ent_conf.set('PACKAGE_VERSION', meson.project_version())
configure_file(input: 'gtkdocentities.ent.in', output: 'gtkdocentities.ent', configuration: ent_conf)
......@@ -22,9 +22,9 @@
project(
'calls',
'c', 'vala',
version: '0.3.4',
version: '41.alpha',
license: 'GPLv3+',
meson_version: '>= 0.47.0',
meson_version: '>= 0.49.0',
default_options: [
'warning_level=1',
'buildtype=debugoptimized',
......@@ -32,8 +32,8 @@ project(
]
)
calls_id = 'sm.puri.Calls'
calls_homepage = 'https://source.puri.sm/Librem5/calls'
calls_id = 'org.gnome.Calls'
calls_homepage = 'https://gitlab.gnome.org/GNOME/calls'
calls_name = meson.project_name()
calls_version = meson.project_version()
......@@ -97,8 +97,10 @@ test_c_args = [
'-Wno-switch-enum',
'-Wtype-limits',
'-Wunused-function',
'-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_58',
' -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66',
'-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_64',
'-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_68',
# see https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/332
'-DEDS_DISABLE_DEPRECATED',
]
if get_option('buildtype') != 'plain'
......@@ -123,3 +125,4 @@ subdir('doc')
subdir('data')
subdir('tests')
meson.add_install_script('build-aux/meson/postinstall.py')
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment