Merge remote-tracking branch 'origin/master' into master_github

tsdgeos · tsdgeos · commit 7806976f8593 · 2024-12-02T00:11:36.000+01:00
diff --git a/poppler/Annot.cc b/poppler/Annot.cc
@@ -58,6 +58,7 @@
 // Copyright (C) 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela <sune@vuorela.dk>
 // Copyright (C) 2024 Pratham Gandhi <ppg.1382@gmail.com>
 // Copyright (C) 2024 Carsten Emde <ce@ceek.de>
+// Copyright (C) 2024 Lucas Baudin <lucas.baudin@ensae.fr>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
diff --git a/poppler/Annot.h b/poppler/Annot.h
@@ -44,6 +44,7 @@
 // Copyright (C) 2022 Martin <martinbts@gmx.net>
 // Copyright (C) 2024 Erich E. Hoover <erich.e.hoover@gmail.com>
 // Copyright (C) 2024 Carsten Emde <ce@ceek.de>
+// Copyright (C) 2024 Lucas Baudin <lucas.baudin@ensae.fr>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
diff --git a/poppler/CertificateInfo.cc b/poppler/CertificateInfo.cc
@@ -8,7 +8,7 @@
 // Copyright 2018, 2019, 2022 Albert Astals Cid <aacid@kde.org>
 // Copyright 2018 Oliver Sander <oliver.sander@tu-dresden.de>
 // Copyright 2020 Thorsten Behrens <Thorsten.Behrens@CIB.de>
-// Copyright 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela <sune@vuorela.dk>
+// Copyright 2023, 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela <sune@vuorela.dk>
 //
 //========================================================================
 
diff --git a/poppler/CertificateInfo.h b/poppler/CertificateInfo.h
@@ -8,7 +8,7 @@
 // Copyright 2018, 2019 Albert Astals Cid <aacid@kde.org>
 // Copyright 2018 Oliver Sander <oliver.sander@tu-dresden.de>
 // Copyright 2020 Thorsten Behrens <Thorsten.Behrens@CIB.de>
-// Copyright 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela <sune@vuorela.dk>
+// Copyright 2023, 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela <sune@vuorela.dk>
 //
 //========================================================================
 
diff --git a/poppler/CryptoSignBackend.cc b/poppler/CryptoSignBackend.cc
@@ -4,7 +4,7 @@
 //
 // This file is licensed under the GPLv2 or later
 //
-// Copyright 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela <sune@vuorela.dk>
+// Copyright 2023, 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela <sune@vuorela.dk>
 //========================================================================
 #include "CryptoSignBackend.h"
 #include "config.h"

-Original file line number
+Diff line change
 // Copyright (C) 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela <[email protected]>
 // Copyright (C) 2024 Pratham Gandhi <[email protected]>
 // Copyright (C) 2024 Carsten Emde <[email protected]>
 +// Copyright (C) 2024 Lucas Baudin <[email protected]>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
-Original file line number
+Diff line change
 // Copyright 2018, 2019, 2022 Albert Astals Cid <[email protected]>
 // Copyright 2018 Oliver Sander <[email protected]>
 // Copyright 2020 Thorsten Behrens <[email protected]>
 -// Copyright 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela <[email protected]>
 +// Copyright 2023, 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela <[email protected]>
 //
 //========================================================================