From 7c730f2ea6e54c4a25f3439d7fe091a2e12342ba Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Mon, 17 Jul 2023 17:48:00 +0200 Subject: [PATCH 1/2] Bump meson project version to 0.4.0 We already have a 0.4 tagged. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 546b970..31bbfa7 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('picplanner', 'c', - version: '0.3.2', + version: '0.4.0', meson_version: '>= 0.50.0', default_options: [ 'warning_level=2', 'c_std=gnu11', From e9670fed22080f230c6330be7e56e074d3ac619d Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Mon, 17 Jul 2023 17:38:52 +0200 Subject: [PATCH 2/2] Include shumate copyright As the code in src/map/draw-layer.c is mainly taken from shumate, the copyright from the following files also applies: - https://gitlab.gnome.org/GNOME/libshumate/-/blob/main/shumate/shumate-path-layer.c - https://gitlab.gnome.org/GNOME/libshumate/-/blob/main/shumate/shumate-marker-layer.c As the code in src/map/marker.c is mainly taken from shumate, the copyright from the following files also applies: - https://gitlab.gnome.org/GNOME/libshumate/-/blob/main/shumate/shumate-marker.c The resulting code is (of course) still licensable under GPLv3+, see https://www.gnu.org/licenses/gpl-faq.html#AllCompatibility --- copyright | 38 ++++++++++++++++++++++++++------------ src/map/draw-layer.c | 3 +++ src/map/draw-layer.h | 3 +++ src/map/marker.c | 3 +++ src/map/marker.h | 3 +++ 5 files changed, 38 insertions(+), 12 deletions(-) diff --git a/copyright b/copyright index e668ced..ded606f 100644 --- a/copyright +++ b/copyright @@ -1,18 +1,32 @@ Files: * -Copyright: 2020-2022 Zwarf +Copyright: + 2020-2022 Zwarf License: GPL-3+ -Files: data/icons/pin.svg - data/icons/sun.svg - data/icons/moon-full.svg - data/icons/moon-waning.svg - data/icons/moon-new.svg - data/icons/moon-waxing.svg - data/icons/milky-way-symbolic.svg - data/icons/milky-way-color.svg -Copyright: 2022 Rajdeep Singha +Files: + src/map/draw-layer.* + src/map/marker.* +Copyright: + 2008-2009 Pierre-Luc Beaudoin + 2011-2013 Jiri Techet + 2019 Marcus Lundblad + 2021 Zwarf License: GPL-3+ -Files: data/icons/map-symbolic.svg +Files: + data/icons/pin.svg + data/icons/sun.svg + data/icons/moon-full.svg + data/icons/moon-waning.svg + data/icons/moon-new.svg + data/icons/moon-waxing.svg + data/icons/milky-way-symbolic.svg + data/icons/milky-way-color.svg +Copyright: + 2022 Rajdeep Singha +License: GPL-3+ + +Files: + data/icons/map-symbolic.svg Copyright: GNOME -License: GPL-3+ \ No newline at end of file +License: GPL-3+ diff --git a/src/map/draw-layer.c b/src/map/draw-layer.c index b1eb8c6..dc8e692 100644 --- a/src/map/draw-layer.c +++ b/src/map/draw-layer.c @@ -1,5 +1,8 @@ /* * draw-layer.c + * Copyright (C) 2008-2009 Pierre-Luc Beaudoin + * Copyright (C) 2011-2013 Jiri Techet + * Copyright (C) 2019 Marcus Lundblad * Copyright (C) 2021 Zwarf * * This program is free software: you can redistribute it and/or modify diff --git a/src/map/draw-layer.h b/src/map/draw-layer.h index 8d3831b..715e264 100644 --- a/src/map/draw-layer.h +++ b/src/map/draw-layer.h @@ -1,5 +1,8 @@ /* * draw-layer.h + * Copyright (C) 2008-2009 Pierre-Luc Beaudoin + * Copyright (C) 2011-2013 Jiri Techet + * Copyright (C) 2019 Marcus Lundblad * Copyright (C) 2021 Zwarf * * This program is free software: you can redistribute it and/or modify diff --git a/src/map/marker.c b/src/map/marker.c index 1683b88..885463b 100644 --- a/src/map/marker.c +++ b/src/map/marker.c @@ -1,5 +1,8 @@ /* * marker.c + * Copyright (C) 2008 Pierre-Luc Beaudoin + * Copyright (C) 2011-2013 Jiri Techet + * Copyright (C) 2019 Marcus Lundblad * Copyright (C) 2021 Zwarf * * This program is free software: you can redistribute it and/or modify diff --git a/src/map/marker.h b/src/map/marker.h index b655eb6..4ecb23f 100644 --- a/src/map/marker.h +++ b/src/map/marker.h @@ -1,5 +1,8 @@ /* * marker.h + * Copyright (C) 2008 Pierre-Luc Beaudoin + * Copyright (C) 2011-2013 Jiri Techet + * Copyright (C) 2019 Marcus Lundblad * Copyright (C) 2021 Zwarf * * This program is free software: you can redistribute it and/or modify