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 <[email protected]>

16 files changed, 11 insertions, 29 deletions

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 99c283dfaf..0a551c7d30 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -4,12 +4,11 @@
 ;;; Copyright © 2016, 2020 Marius Bakke <[email protected]>
 ;;; Copyright © 2017 Julien Lepiller <[email protected]>
 ;;; Copyright © 2017 Hartmut Goebel <[email protected]>
-;;; Copyright © 2017 Maxim Cournoyer <[email protected]>
+;;; Copyright © 2017, 2020 Maxim Cournoyer <[email protected]>
 ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <[email protected]>
 ;;; Copyright © 2018 Efraim Flashner <[email protected]>
 ;;; Copyright © 2019, 2020 Andreas Enge <[email protected]>
 ;;; Copyright © 2019 Ricardo Wurmus <[email protected]>
-;;; Copyright © 2020 Maxim Cournoyer <[email protected]>
 ;;; Copyright © 2020 Sergey Trofimov <[email protected]>
 ;;;
 ;;; This file is part of GNU Guix.
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 04b354b71e..7551b31e85 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 <[email protected]>
-;;; Copyright © 2015 Andreas Enge <[email protected]>
+;;; Copyright © 2013, 2015 Andreas Enge <[email protected]>
 ;;; Copyright © 2015, 2018 Ricardo Wurmus <[email protected]>
 ;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner <[email protected]>
 ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <[email protected]>
@@ -9,7 +9,6 @@
 ;;; Copyright © 2018 Fis Trivial <[email protected]>
 ;;; Copyright © 2018 Pierre Neidhardt <[email protected]>
 ;;; Copyright © 2014 Eric Bavier <[email protected]>
-;;; Copyright © 2013 Andreas Enge <[email protected]>
 ;;; Copyright © 2014 Mark H Weaver <[email protected]>
 ;;; Copyright © 2019 Hartmut Goebel <[email protected]>
 ;;; Copyright © 2020 Maxim Cournoyer <[email protected]>
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index f4708eda91..4af71ba93a 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2019, 2020 Mathieu Othacehe <[email protected]>
 ;;; Copyright © 2019 Pierre Neidhardt <[email protected]>
 ;;; Copyright © 2019 Jan Wielkiewicz <[email protected]>
-;;; Copyright © 2020 Nicolò Balzarotti <[email protected]>
+;;; Copyright © 2020, 2021 Nicolò Balzarotti <[email protected]>
 ;;; Copyright © 2020 Roel Janssen <[email protected]>
 ;;; Copyright © 2020 Ricardo Wurmus <[email protected]>
 ;;; Copyright © 2020 Brice Waegeneire <[email protected]>
@@ -18,7 +18,6 @@
 ;;; Copyright © 2020 Brett Gilio <[email protected]>
 ;;; Copyright © 2020 Milkey Mouse <[email protected]>
 ;;; Copyright © 2021 Raghav Gururajan <[email protected]>
-;;; Copyright © 2021 Nicolò Balzarotti <[email protected]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index a27fd637eb..b519aa91fb 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -27,7 +27,7 @@
 ;;; Copyright © 2017, 2018 Alex Vong <[email protected]>
 ;;; Copyright © 2017, 2018 Ben Woodcroft <[email protected]>
 ;;; Copyright © 2017 Rutger Helling <[email protected]>
-;;; Copyright © 2017, 2018 Pierre Langlois <[email protected]>
+;;; Copyright © 2017, 2018, 2019 Pierre Langlois <[email protected]>
 ;;; Copyright © 2015, 2017, 2018, 2019, 2021 Ricardo Wurmus <[email protected]>
 ;;; Copyright © 2017 Kristofer Buffington <[email protected]>
 ;;; Copyright © 2018 Amirouche Boubekki <[email protected]>
@@ -36,7 +36,6 @@
 ;;; Copyright © 2019 Jack Hill <[email protected]>
 ;;; Copyright © 2019 Alex Griffin <[email protected]>
 ;;; Copyright © 2019 Gábor Boskovits <[email protected]>
-;;; Copyright © 2019 Pierre Langlois <[email protected]>
 ;;; Copyright © 2019, 2021 Guillaume Le Vaillant <[email protected]>
 ;;; Copyright © 2020 Pierre Neidhardt <[email protected]>
 ;;; Copyright © 2020, 2021 Nicolò Balzarotti <[email protected]>
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 05d10bc4ae..2754ce7049 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -74,7 +74,6 @@
 ;;; Copyright © 2020 Ryan Desfosses <[email protected]>
 ;;; Copyright © 2020 Marcin Karpezo <[email protected]>
 ;;; Copyright © 2020 Fredrik Salomonsson <[email protected]>
-;;; Copyright © 2020 Ryan Desfosses <[email protected]>
 ;;; Copyright © 2020 Eric Bavier <[email protected]>
 ;;; Copyright © 2020, 2021 Morgan Smith <[email protected]>
 ;;; Copyright © 2020 Peng Mei Yu <[email protected]>
diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm
index 3f1145b520..f811ba77c7 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 <[email protected]>
 ;;; Copyright © 2014, 2015 Mark H Weaver <[email protected]>
-;;; Copyright © 2016, 2017 Efraim Flashner <[email protected]>
+;;; Copyright © 2016, 2017, 2018 Efraim Flashner <[email protected]>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email protected]>
-;;; Copyright © 2018 Efraim Flashner <[email protected]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index bc47ddb0d1..514125977b 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2017, 2018 Mark H Weaver <[email protected]>
 ;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke <[email protected]>
 ;;; Copyright © 2017, 2018, 2019 Rutger Helling <[email protected]>
-;;; Copyright © 2017, 2020 Brendan Tildesley <[email protected]>
+;;; Copyright © 2017, 2020, 2021 Brendan Tildesley <[email protected]>
 ;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <[email protected]>
 ;;; Copyright © 2018 Pierre Neidhardt <[email protected]>
 ;;; Copyright © 2018 Stefan Stefanović <[email protected]>
@@ -22,7 +22,6 @@
 ;;; Copyright © 2020 Nicolò Balzarotti <[email protected]>
 ;;; Copyright © 2020 Anders Thuné <[email protected]>
 ;;; Copyright © 2020 Raghav Gururajan <[email protected]>
-;;; Copyright © 2021 Brendan Tildesley <[email protected]>
 ;;; Copyright © 2021 pineapples <[email protected]>
 ;;; Copyright © 2021 Robby Zambito <[email protected]>
 ;;;
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index f6b9232e0a..a417e363bb 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -5,7 +5,6 @@
 ;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <[email protected]>
 ;;; Copyright © 2016 Nikita <[email protected]>
 ;;; Copyright © 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus <[email protected]>
-;;; Copyright © 2016 David Thompson <[email protected]>
 ;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner <[email protected]>
 ;;; Copyright © 2017 Arun Isaac <[email protected]>
 ;;; Copyright © 2017, 2018, 2019 Rutger Helling <[email protected]>
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index 7a5b1eb118..03bff15760 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -7,7 +7,6 @@
 ;;; Copyright © 2020 Vincent Legoll <[email protected]>
 ;;; Copyright © 2020 Marius Bakke <[email protected]>
 ;;; Copyright © 2021 Björn Höfling <[email protected]>
-;;; Copyright © 2021 Efraim Flashner <[email protected]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 63141da3ab..2836a01d49 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -30,12 +30,11 @@
 ;;; Copyright © 2018 Pierre-Antoine Rouby <[email protected]>
 ;;; Copyright © 2018, 2020 Brendan Tildesley <[email protected]>
 ;;; Copyright © 2018 Manuel Graf <[email protected]>
-;;; Copyright © 2018 Pierre Langlois <[email protected]>
+;;; Copyright © 2018, 2019 Pierre Langlois <[email protected]>
 ;;; Copyright © 2018 Vasile Dumitrascu <[email protected]>
 ;;; Copyright © 2019 Tim Gesthuizen <[email protected]>
 ;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer <[email protected]>
 ;;; Copyright © 2019 Stefan Stefanović <[email protected]>
-;;; Copyright © 2019 Pierre Langlois <[email protected]>
 ;;; Copyright © 2019, 2020, 2021 Brice Waegeneire <[email protected]>
 ;;; Copyright © 2019 Kei Kebreau <[email protected]>
 ;;; Copyright © 2020, 2021 Oleg Pykhalov <[email protected]>
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 3655a3dac7..c6788e8d86 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -20,7 +20,7 @@
 ;;; Copyright © 2017 Thomas Danckaert <[email protected]>
 ;;; Copyright © 2018 Adam Van Ymeren <[email protected]>
 ;;; Copyright © 2018 Fis Trivial <[email protected]>
-;;; Copyright © 2018 Tonton <[email protected]>
+;;; Copyright © 2018, 2019 Tonton <[email protected]>
 ;;; Copyright © 2018 Clément Lassieur <[email protected]>
 ;;; Copyright © 2018 Theodoros Foradis <[email protected]>
 ;;; Copyright © 2018, 2020, 2021 Marius Bakke <[email protected]>
@@ -31,7 +31,6 @@
 ;;; Copyright © 2019 Julien Lepiller <[email protected]>
 ;;; Copyright © 2019 Timotej Lazar <[email protected]>
 ;;; Copyright © 2019, 2020, 2021 Brice Waegeneire <[email protected]>
-;;; Copyright © 2019 Tonton <[email protected]>
 ;;; Copyright © 2019, 2020 Alex Griffin <[email protected]>
 ;;; Copyright © 2019, 2020 Jan Wielkiewicz <[email protected]>
 ;;; Copyright © 2019 Daniel Schaefer <[email protected]>
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d9d1c8eb35..20502ac255 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -42,7 +42,6 @@
 ;;; Copyright © 2017, 2020, 2021 Roel Janssen <[email protected]>
 ;;; Copyright © 2017, 2018, 2019 Kei Kebreau <[email protected]>
 ;;; Copyright © 2017 Rutger Helling <[email protected]>
-;;; Copyright © 2017 Muriithi Frederick Muriuki <[email protected]>
 ;;; Copyright © 2017, 2019, 2021 Brendan Tildesley <[email protected]>
 ;;; Copyright © 2018 Ethan R. Jones <[email protected]
 ;;; Copyright © 2018 Fis Trivial <[email protected]>
@@ -72,9 +71,8 @@
 ;;; Copyright © 2020 Jakub Kądziołka <[email protected]>
 ;;; Copyright © 2020 sirgazil <[email protected]>
 ;;; Copyright © 2020 Sebastian Schott <[email protected]>
-;;; Copyright © 2020 Alexandros Theodotou <[email protected]>
-;;; Copyright © 2020 Josh Marshall <[email protected]>
 ;;; Copyright © 2020, 2021 Alexandros Theodotou <[email protected]>
+;;; Copyright © 2020 Josh Marshall <[email protected]>
 ;;; Copyright © 2020 Lars-Dominik Braun <[email protected]>
 ;;; Copyright © 2020 Alex ter Weele <[email protected]>
 ;;; Copyright © 2020 Matthew James Kraai <[email protected]>
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3bb57ee2bd..6fa0987d24 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -28,7 +28,6 @@
 ;;; Copyright © 2016 David Craven <[email protected]>
 ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke <[email protected]>
 ;;; Copyright © 2016, 2017 Stefan Reichör <[email protected]>
-;;; Copyright © 2016 Dylan Jeffers <sapientech@[email protected]>
 ;;; Copyright © 2016, 2017 Alex Vong <[email protected]>
 ;;; Copyright © 2016, 2017, 2018 Arun Isaac <[email protected]>
 ;;; Copyright © 2016, 2017, 2018 Julien Lepiller <[email protected]>
@@ -43,7 +42,6 @@
 ;;; Copyright © 2017 Roel Janssen <[email protected]>
 ;;; Copyright © 2017, 2018 Kei Kebreau <[email protected]>
 ;;; Copyright © 2017 Rutger Helling <[email protected]>
-;;; Copyright © 2017 Muriithi Frederick Muriuki <[email protected]>
 ;;; Copyright © 2017 Brendan Tildesley <[email protected]>
 ;;; Copyright © 2018 Ethan R. Jones <[email protected]
 ;;; Copyright © 2018 Fis Trivial <[email protected]>
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c0be286cec..b6acebcecc 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4,13 +4,12 @@
 ;;; Copyright © 2014, 2015, 2016, 2018, 2020 Mark H Weaver <[email protected]>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <[email protected]>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <[email protected]>
-;;; Copyright © 2015 Andy Patterson <[email protected]>
+;;; Copyright © 2015, 2016 Andy Patterson <[email protected]>
 ;;; Copyright © 2015, 2018, 2019, 2020 Ricardo Wurmus <[email protected]>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Alex Vong <[email protected]>
 ;;; Copyright © 2016, 2017 Alex Griffin <[email protected]>
 ;;; Copyright © 2016 Kei Kebreau <[email protected]>
 ;;; Copyright © 2016 Dmitry Nikolaev <[email protected]>
-;;; Copyright © 2016 Andy Patterson <[email protected]>
 ;;; Copyright © 2016, 2017 Nikita <[email protected]>
 ;;; Copyright © 2016, 2018, 2019, 2020, 2021 Eric Bavier <[email protected]>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <[email protected]>
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index eb3f30eca7..2e4eb30a9c 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -13,7 +13,6 @@
 ;;; Copyright © 2016, 2018 Ricardo Wurmus <[email protected]>
 ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <[email protected]>
 ;;; Copyright © 2016 Leo Famulari <[email protected]>
-;;; Copyright © 2016 Alex Kost <[email protected]>
 ;;; Copyright © 2016, 2017, 2019, 2020 Marius Bakke <[email protected]>
 ;;; Copyright © 2016 Petter <[email protected]>
 ;;; Copyright © 2017 Mekeor Melire <[email protected]>
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 6a093cf4e4..bb42eacf83 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 <[email protected]>
 ;;; Copyright © 2016 Nikita <[email protected]>
 ;;; Copyright © 2016, 2017, 2018 Julien Lepiller <[email protected]>
-;;; Copyright © 2017 Christopher Baines <[email protected]>
+;;; Copyright © 2017, 2018, 2019 Christopher Baines <[email protected]>
 ;;; Copyright © 2017 nee <[email protected]>
 ;;; Copyright © 2017, 2018 Clément Lassieur <[email protected]>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <[email protected]>
-;;; Copyright © 2017, 2018, 2019 Christopher Baines <[email protected]>
 ;;; Copyright © 2018 Marius Bakke <[email protected]>
 ;;; Copyright © 2019, 2020 Florian Pelz <[email protected]>
 ;;; Copyright © 2020 Ricardo Wurmus <[email protected]>