From a5b2474037d749f42a816c60f0393941ba97444e Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 15 Jun 2021 16:31:41 +0000 Subject: [PATCH] gnu: Consolidate duplicate copyright names. * gnu/packages/android.scm: Consolidate copyright lines with the same email address. * gnu/packages/code.scm: Likewise. * gnu/packages/cpp.scm: Likewise. * gnu/packages/databases.scm: Likewise. * gnu/packages/emacs-xyz.scm: Likewise. * gnu/packages/file.scm: Likewise. * gnu/packages/freedesktop.scm: Likewise. * gnu/packages/gl.scm: Likewise. * gnu/packages/gps.scm: Likewise. * gnu/packages/linux.scm: Likewise. * gnu/packages/networking.scm: Likewise. * gnu/packages/python-xyz.scm: Likewise. * gnu/packages/python.scm: Likewise. * gnu/packages/video.scm: Likewise. * gnu/packages/xdisorg.scm: Likewise. * gnu/services/web.scm: Likewise. Signed-off-by: Liliana Marie Prikler --- gnu/packages/android.scm | 3 +-- gnu/packages/code.scm | 3 +-- gnu/packages/cpp.scm | 3 +-- gnu/packages/databases.scm | 3 +-- gnu/packages/emacs-xyz.scm | 1 - gnu/packages/file.scm | 3 +-- gnu/packages/freedesktop.scm | 3 +-- gnu/packages/gl.scm | 1 - gnu/packages/gps.scm | 1 - gnu/packages/linux.scm | 3 +-- gnu/packages/networking.scm | 3 +-- gnu/packages/python-xyz.scm | 4 +--- gnu/packages/python.scm | 2 -- gnu/packages/video.scm | 3 +-- gnu/packages/xdisorg.scm | 1 - gnu/services/web.scm | 3 +-- 16 files changed, 11 insertions(+), 29 deletions(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 99c283dfafade028a2483abacbf68d3f867f06fd..0a551c7d305a67e9624a29e45c39eaca43c8f659 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -4,12 +4,11 @@ ;;; Copyright © 2016, 2020 Marius Bakke ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2017 Hartmut Goebel -;;; Copyright © 2017 Maxim Cournoyer +;;; Copyright © 2017, 2020 Maxim Cournoyer ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019, 2020 Andreas Enge ;;; Copyright © 2019 Ricardo Wurmus -;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Sergey Trofimov ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 04b354b71e16d795cc76d459921d81752305a7a3..7551b31e8503244f52f405a4e75557d7c919c834 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015, 2018, 2020, 2021 Ludovic Courtès -;;; Copyright © 2015 Andreas Enge +;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -9,7 +9,6 @@ ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2014 Eric Bavier -;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Maxim Cournoyer diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index f4708eda91d3642aa134c27782a085401cc6ab7d..4af71ba93a24cea8a4a6dd3880e88a082e4e6e7f 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 Jan Wielkiewicz -;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2020, 2021 Nicolò Balzarotti ;;; Copyright © 2020 Roel Janssen ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Brice Waegeneire @@ -18,7 +18,6 @@ ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Milkey Mouse ;;; Copyright © 2021 Raghav Gururajan -;;; Copyright © 2021 Nicolò Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a27fd637ebcbe54d07b9279e47fe66373f0f5452..b519aa91fb4e3847d4fc9daf3d88dd03a431e86c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2017, 2018 Alex Vong ;;; Copyright © 2017, 2018 Ben Woodcroft ;;; Copyright © 2017 Rutger Helling -;;; Copyright © 2017, 2018 Pierre Langlois +;;; Copyright © 2017, 2018, 2019 Pierre Langlois ;;; Copyright © 2015, 2017, 2018, 2019, 2021 Ricardo Wurmus ;;; Copyright © 2017 Kristofer Buffington ;;; Copyright © 2018 Amirouche Boubekki @@ -36,7 +36,6 @@ ;;; Copyright © 2019 Jack Hill ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Gábor Boskovits -;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019, 2021 Guillaume Le Vaillant ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020, 2021 Nicolò Balzarotti diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 05d10bc4aeded64d1ab656b4d6cdda0f9cb0f311..2754ce70493b7089bfad7c1a4bd9a96dccf7c811 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -74,7 +74,6 @@ ;;; Copyright © 2020 Ryan Desfosses ;;; Copyright © 2020 Marcin Karpezo ;;; Copyright © 2020 Fredrik Salomonsson -;;; Copyright © 2020 Ryan Desfosses ;;; Copyright © 2020 Eric Bavier ;;; Copyright © 2020, 2021 Morgan Smith ;;; Copyright © 2020 Peng Mei Yu diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm index 3f1145b52056e91406b1386caf6e5eb695979909..f811ba77c7519db60c9954b0aecac14d851de495 100644 --- a/gnu/packages/file.scm +++ b/gnu/packages/file.scm @@ -1,9 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index bc47ddb0d1cc3df582610c984b7a4d1b74f8c4ed..514125977ba77c9ee63261f66041e16d3129ce0a 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2017, 2018 Mark H Weaver ;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2017, 2020 Brendan Tildesley +;;; Copyright © 2017, 2020, 2021 Brendan Tildesley ;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Stefan Stefanović @@ -22,7 +22,6 @@ ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Anders Thuné ;;; Copyright © 2020 Raghav Gururajan -;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 pineapples ;;; Copyright © 2021 Robby Zambito ;;; diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index f6b9232e0ac5bd87411976fe7e6dc6032dd7f50a..a417e363bb19421792488a2eb84a6b1307559b63 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -5,7 +5,6 @@ ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver ;;; Copyright © 2016 Nikita ;;; Copyright © 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus -;;; Copyright © 2016 David Thompson ;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2018, 2019 Rutger Helling diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 7a5b1eb11897abd0c2e8b8a084ebcc4b83eeace4..03bff1576055ba2e3f34fd22402cea44f8ac5e89 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -7,7 +7,6 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 Björn Höfling -;;; Copyright © 2021 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 63141da3abfb536a0c9b05d21678587a56dc2cbd..2836a01d499bd429adec359694fb64e184924e49 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -30,12 +30,11 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018, 2020 Brendan Tildesley ;;; Copyright © 2018 Manuel Graf -;;; Copyright © 2018 Pierre Langlois +;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2018 Vasile Dumitrascu ;;; Copyright © 2019 Tim Gesthuizen ;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2019 Stefan Stefanović -;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019, 2020, 2021 Brice Waegeneire ;;; Copyright © 2019 Kei Kebreau ;;; Copyright © 2020, 2021 Oleg Pykhalov diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 3655a3dac7347b1dd9f211d49f17ee2f8ea24642..c6788e8d86fe14de2d85ef6cb16c97cacf2ed680 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2018 Adam Van Ymeren ;;; Copyright © 2018 Fis Trivial -;;; Copyright © 2018 Tonton +;;; Copyright © 2018, 2019 Tonton ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Theodoros Foradis ;;; Copyright © 2018, 2020, 2021 Marius Bakke @@ -31,7 +31,6 @@ ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Timotej Lazar ;;; Copyright © 2019, 2020, 2021 Brice Waegeneire -;;; Copyright © 2019 Tonton ;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2019, 2020 Jan Wielkiewicz ;;; Copyright © 2019 Daniel Schaefer diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d9d1c8eb356e21b6bd672bda5f06b1dd3c2381c7..20502ac25559730b65af86940261a307e0b0a253 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -42,7 +42,6 @@ ;;; Copyright © 2017, 2020, 2021 Roel Janssen ;;; Copyright © 2017, 2018, 2019 Kei Kebreau ;;; Copyright © 2017 Rutger Helling -;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017, 2019, 2021 Brendan Tildesley ;;; Copyright © 2018 Ethan R. Jones @@ -72,9 +71,8 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 sirgazil ;;; Copyright © 2020 Sebastian Schott -;;; Copyright © 2020 Alexandros Theodotou -;;; Copyright © 2020 Josh Marshall ;;; Copyright © 2020, 2021 Alexandros Theodotou +;;; Copyright © 2020 Josh Marshall ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Alex ter Weele ;;; Copyright © 2020 Matthew James Kraai diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3bb57ee2bd51a1cf905175a81f2c2b3815075bb0..6fa0987d2498b4a8644c161e93d509b7cee28f96 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -28,7 +28,6 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2016, 2017 Stefan Reichör -;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017 Alex Vong ;;; Copyright © 2016, 2017, 2018 Arun Isaac ;;; Copyright © 2016, 2017, 2018 Julien Lepiller @@ -43,7 +42,6 @@ ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2017, 2018 Kei Kebreau ;;; Copyright © 2017 Rutger Helling -;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Ethan R. Jones diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c0be286cec17a649b66066f6295ad6478bef461f..b6acebceccca66ba00e74556af3350b65ec25f4e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4,13 +4,12 @@ ;;; Copyright © 2014, 2015, 2016, 2018, 2020 Mark H Weaver ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner -;;; Copyright © 2015 Andy Patterson +;;; Copyright © 2015, 2016 Andy Patterson ;;; Copyright © 2015, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Alex Vong ;;; Copyright © 2016, 2017 Alex Griffin ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016 Dmitry Nikolaev -;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2018, 2019, 2020, 2021 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index eb3f30eca7812a306179994efd3e7c139de068a8..2e4eb30a9cad2cc97c119eaa954bb86960c4e30c 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -13,7 +13,6 @@ ;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Leo Famulari -;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016, 2017, 2019, 2020 Marius Bakke ;;; Copyright © 2016 Petter ;;; Copyright © 2017 Mekeor Melire diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 6a093cf4e4cfb310796ae354872766828b75be76..bb42eacf83d6fdfbd8187a21ded5bbed54b268fd 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -3,11 +3,10 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2016 Nikita ;;; Copyright © 2016, 2017, 2018 Julien Lepiller -;;; Copyright © 2017 Christopher Baines +;;; Copyright © 2017, 2018, 2019 Christopher Baines ;;; Copyright © 2017 nee ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2018 Pierre-Antoine Rouby -;;; Copyright © 2017, 2018, 2019 Christopher Baines ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2019, 2020 Florian Pelz ;;; Copyright © 2020 Ricardo Wurmus