Modify copyright format in qt_attribution.json

Multiline copyright entries are entered via string array.

Task-number: QTBUG-111873
Pick-to: 6.5 6.6
Change-Id: Ib8203163db8d5d579117f402b7a89b59ae1a5169
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Lucie Gérard 2023-09-01 13:54:21 +02:00 committed by Lucie Gerard
parent 89f0f34db5
commit c0f13eeb99
14 changed files with 104 additions and 108 deletions

View File

@ -14,36 +14,36 @@
"License": "Freetype Project License or GNU General Public License v2.0 only", "License": "Freetype Project License or GNU General Public License v2.0 only",
"LicenseId": "FTL OR GPL-2.0-only", "LicenseId": "FTL OR GPL-2.0-only",
"LicenseFile": "LICENSE.txt", "LicenseFile": "LICENSE.txt",
"Copyright": "Copyright (c) 2007-2014 Adobe Systems Incorporated "Copyright": ["Copyright (c) 2007-2014 Adobe Systems Incorporated",
Copyright (c) 2004-2023 Albert Chin-A-Young "Copyright (c) 2004-2023 Albert Chin-A-Young",
Copyright (c) 2018-2023 Armin Hasitzka, David Turner, Robert Wilhelm, and Werner Lemberg "Copyright (c) 2018-2023 Armin Hasitzka, David Turner, Robert Wilhelm, and Werner Lemberg",
Copyright (c) 2000 Computing Research Labs, New Mexico State University "Copyright (c) 2000 Computing Research Labs, New Mexico State University",
Copyright (c) 1996-2023 David Turner, Robert Wilhelm, Dominik Röttsches, and Werner Lemberg "Copyright (c) 1996-2023 David Turner, Robert Wilhelm, Dominik Röttsches, and Werner Lemberg",
Copyright (c) 2004-2023 David Turner, Robert Wilhelm, Werner Lemberg and George Williams "Copyright (c) 2004-2023 David Turner, Robert Wilhelm, Werner Lemberg and George Williams",
Copyright (c) 2022-2023 David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti "Copyright (c) 2022-2023 David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti",
Copyright (c) 2008-2023 David Turner, Robert Wilhelm, Werner Lemberg, and suzuki toshiya "Copyright (c) 2008-2023 David Turner, Robert Wilhelm, Werner Lemberg, and suzuki toshiya",
Copyright (c) 2003-2023 David Turner, Robert Wilhelm, and Werner Lemberg "Copyright (c) 2003-2023 David Turner, Robert Wilhelm, and Werner Lemberg",
Copyright (c) 2005-2023 David Turner "Copyright (c) 2005-2023 David Turner",
Copyright (c) 2007-2023 Derek Clegg and Michael Toftdal "Copyright (c) 2007-2023 Derek Clegg and Michael Toftdal",
Copyright (c) 2007 Dmitry Timoshkov for Codeweavers "Copyright (c) 2007 Dmitry Timoshkov for Codeweavers",
Copyright (c) 2001-2015 Francesco Zappa Nardelli "Copyright (c) 2001-2015 Francesco Zappa Nardelli",
Copyright (c) 2005, 2007, 2008, 2013 George Williams "Copyright (c) 2005, 2007, 2008, 2013 George Williams",
Copyright (c) 2013-2023 Google, Inc. Google Author(s) Behdad Esfahbod and Stuart Gill "Copyright (c) 2013-2023 Google, Inc. Google Author(s) Behdad Esfahbod and Stuart Gill",
Copyright (c) 2013-2022 Google, Inc. "Copyright (c) 2013-2022 Google, Inc.",
Copyright (c) 2003 Huw D M Davies for Codeweavers "Copyright (c) 2003 Huw D M Davies for Codeweavers",
Copyright (c) 2010-2023 Joel Klinghed "Copyright (c) 2010-2023 Joel Klinghed",
Copyright (c) 1996-2023 Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg "Copyright (c) 1996-2023 Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg",
Copyright (c) 2003-2023 Masatake YAMATO and Redhat K.K. "Copyright (c) 2003-2023 Masatake YAMATO and Redhat K.K.",
Copyright (c) 2004-2023 Masatake YAMATO, Redhat K.K, David Turner, Robert Wilhelm, and Werner Lemberg "Copyright (c) 2004-2023 Masatake YAMATO, Redhat K.K, David Turner, Robert Wilhelm, and Werner Lemberg",
Copyright (c) 2019-2023 Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg "Copyright (c) 2019-2023 Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg",
Copyright (c) 2009-2023 Oran Agra and Mickey Gabel "Copyright (c) 2009-2023 Oran Agra and Mickey Gabel",
Copyright (c) 2007-2023 Rahul Bhalerao <rahul.bhalerao@redhat.com> "Copyright (c) 2007-2023 Rahul Bhalerao <rahul.bhalerao@redhat.com>",
Copyright (c) 2002-2023 Roberto Alameda "Copyright (c) 2002-2023 Roberto Alameda",
Copyright (c) 2015-2022 Werner Lemberg "Copyright (c) 2015-2022 Werner Lemberg",
Copyright (c) 2004-2023 suzuki toshiya, Masatake YAMATO, Red Hat K.K., David Turner, Robert Wilhelm, and Werner Lemberg "Copyright (c) 2004-2023 suzuki toshiya, Masatake YAMATO, Red Hat K.K., David Turner, Robert Wilhelm, and Werner Lemberg",
Copyright (c) 2019 nyorain "Copyright (c) 2019 nyorain",
Copyright (c) 2022-2023 David Turner, Robert Wilhelm, Werner Lemberg, George Williams, and Dominik Röttsches "Copyright (c) 2022-2023 David Turner, Robert Wilhelm, Werner Lemberg, George Williams, and Dominik Röttsches",
Copyright (C) 2009, 2023 Red Hat, Inc." "Copyright (C) 2009, 2023 Red Hat, Inc."]
}, },
{ {
"Id": "freetype-zlib", "Id": "freetype-zlib",
@ -71,8 +71,8 @@ Copyright (C) 2009, 2023 Red Hat, Inc."
"License": "MIT License", "License": "MIT License",
"LicenseId": "MIT", "LicenseId": "MIT",
"LicenseFile": "BDF-LICENSE.txt", "LicenseFile": "BDF-LICENSE.txt",
"Copyright": "Copyright (c) 2000 Computing Research Labs, New Mexico State University "Copyright": ["Copyright (c) 2000 Computing Research Labs, New Mexico State University",
Copyright (c) 2001-2014 Francesco Zappa Nardelli" "Copyright (c) 2001-2014 Francesco Zappa Nardelli"]
}, },
{ {
"Id": "freetype-pcf", "Id": "freetype-pcf",
@ -86,8 +86,8 @@ Copyright (c) 2001-2014 Francesco Zappa Nardelli"
"License": "MIT License and MIT Open Group variant", "License": "MIT License and MIT Open Group variant",
"LicenseId": "MIT AND MIT-open-group", "LicenseId": "MIT AND MIT-open-group",
"LicenseFile": "PCF-LICENSE.txt", "LicenseFile": "PCF-LICENSE.txt",
"Copyright": "Copyright (c) 2001, 2012 David Turner, Robert Wilhelm, and Werner Lemberg "Copyright": ["Copyright (c) 2001, 2012 David Turner, Robert Wilhelm, and Werner Lemberg",
Copyright (c) 2000-2014 Francesco Zappa Nardelli "Copyright (c) 2000-2014 Francesco Zappa Nardelli",
Copyright (c) 1990, 1994, 1998 The Open Group" "Copyright (c) 1990, 1994, 1998 The Open Group"]
} }
] ]

View File

@ -13,21 +13,21 @@
"License": "MIT License", "License": "MIT License",
"LicenseId": "MIT", "LicenseId": "MIT",
"LicenseFile": "COPYING", "LicenseFile": "COPYING",
"Copyright": "Copyright © 2010-2022 Google, Inc. "Copyright": ["Copyright © 2010-2022 Google, Inc.",
Copyright © 2015-2020 Ebrahim Byagowi "Copyright © 2015-2020 Ebrahim Byagowi",
Copyright © 2019,2020 Facebook, Inc. "Copyright © 2019,2020 Facebook, Inc.",
Copyright © 2012,2015 Mozilla Foundation "Copyright © 2012,2015 Mozilla Foundation",
Copyright © 2011 Codethink Limited "Copyright © 2011 Codethink Limited",
Copyright © 2008,2010 Nokia Corporation and/or its subsidiary(-ies) "Copyright © 2008,2010 Nokia Corporation and/or its subsidiary(-ies)",
Copyright © 2009 Keith Stribley "Copyright © 2009 Keith Stribley",
Copyright © 2011 Martin Hosken and SIL International "Copyright © 2011 Martin Hosken and SIL International",
Copyright © 2007 Chris Wilson "Copyright © 2007 Chris Wilson",
Copyright © 2005,2006,2020,2021,2022,2023 Behdad Esfahbod "Copyright © 2005,2006,2020,2021,2022,2023 Behdad Esfahbod",
Copyright © 2004,2007,2008,2009,2010,2013,2021,2022,2023 Red Hat, Inc. "Copyright © 2004,2007,2008,2009,2010,2013,2021,2022,2023 Red Hat, Inc.",
Copyright © 1998-2005 David Turner and Werner Lemberg "Copyright © 1998-2005 David Turner and Werner Lemberg",
Copyright © 2016 Igalia S.L. "Copyright © 2016 Igalia S.L.",
Copyright © 2022 Matthias Clasen "Copyright © 2022 Matthias Clasen",
Copyright © 2018,2021 Khaled Hosny "Copyright © 2018,2021 Khaled Hosny",
Copyright © 2018,2019,2020 Adobe, Inc "Copyright © 2018,2019,2020 Adobe, Inc",
Copyright © 2013-2015 Alexei Podtelezhnikov" "Copyright © 2013-2015 Alexei Podtelezhnikov"]
} }

View File

@ -10,9 +10,7 @@
"License": "BSD 3-clause \"New\" or \"Revised\" License", "License": "BSD 3-clause \"New\" or \"Revised\" License",
"LicenseId": "BSD-3-Clause", "LicenseId": "BSD-3-Clause",
"LicenseFile": "LICENSE", "LicenseFile": "LICENSE",
"Copyright": "Copyright (c) 2000, 2006 Sun Microsystems, Inc. "Copyright": ["Copyright (c) 2000, 2006 Sun Microsystems, Inc.",
Copyright (c) 2006 IBM Corporation "Copyright (c) 2006 IBM Corporation",
Copyright (c) 2007, 2010, 2012, 2013 Linux Foundation "Copyright (c) 2007, 2010, 2012, 2013 Linux Foundation\nIAccessible2 is a trademark of the Linux Foundation. The IAccessible2 mark may be used in accordance with the Linux Foundation Trademark Policy to indicate compliance with the IAccessible2 specification."]
IAccessible2 is a trademark of the Linux Foundation. The IAccessible2 mark may be used in accordance with the Linux Foundation Trademark Policy to indicate compliance with the IAccessible2 specification."
} }

View File

@ -13,26 +13,26 @@
"License": "libpng License and PNG Reference Library version 2", "License": "libpng License and PNG Reference Library version 2",
"LicenseId": "Libpng AND libpng-2.0", "LicenseId": "Libpng AND libpng-2.0",
"LicenseFile": "LICENSE", "LicenseFile": "LICENSE",
"Copyright": "Copyright (c) 1995-2023 The PNG Reference Library Authors "Copyright": ["Copyright (c) 1995-2023 The PNG Reference Library Authors",
Copyright (c) 2000-2023 Cosmin Truta "Copyright (c) 2000-2023 Cosmin Truta",
Copyright (c) 1998-2018 Glenn Randers-Pehrson "Copyright (c) 1998-2018 Glenn Randers-Pehrson",
Copyright (c) 1996-1997 Andreas Dilger "Copyright (c) 1996-1997 Andreas Dilger",
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.",
Copyright (c) 2000-2017 Simon-Pierre Cadieux "Copyright (c) 2000-2017 Simon-Pierre Cadieux",
Copyright (c) 2000-2017 Eric S. Raymond "Copyright (c) 2000-2017 Eric S. Raymond",
Copyright (c) 2000-2017 Mans Rullgard "Copyright (c) 2000-2017 Mans Rullgard",
Copyright (c) 2000-2017 Gilles Vollant "Copyright (c) 2000-2017 Gilles Vollant",
Copyright (c) 2000-2017 James Yu "Copyright (c) 2000-2017 James Yu",
Copyright (c) 2000-2017 Mandar Sahastrabuddhe "Copyright (c) 2000-2017 Mandar Sahastrabuddhe",
Copyright (c) 1998-2000 Tom Lane "Copyright (c) 1998-2000 Tom Lane",
Copyright (c) 1998-2000 Willem van Schaik "Copyright (c) 1998-2000 Willem van Schaik",
Copyright (c) 1996-1997 John Bowler "Copyright (c) 1996-1997 John Bowler",
Copyright (c) 1996-1997 Kevin Bracey "Copyright (c) 1996-1997 Kevin Bracey",
Copyright (c) 1996-1997 Sam Bushell "Copyright (c) 1996-1997 Sam Bushell",
Copyright (c) 1996-1997 Magnus Holmgren "Copyright (c) 1996-1997 Magnus Holmgren",
Copyright (c) 1996-1997 Greg Roelofs "Copyright (c) 1996-1997 Greg Roelofs",
Copyright (c) 1996-1997 Tom Tanner "Copyright (c) 1996-1997 Tom Tanner",
Copyright (c) 1995-1996 Dave Martindale "Copyright (c) 1995-1996 Dave Martindale",
Copyright (c) 1995-1996 Paul Schmidt "Copyright (c) 1995-1996 Paul Schmidt",
Copyright (c) 1995-1996 Tim Wegner" "Copyright (c) 1995-1996 Tim Wegner"]
} }

View File

@ -26,8 +26,7 @@ supported by Qt (by the QNetworkCookieJar class).",
"License": "Mozilla Public License 2.0", "License": "Mozilla Public License 2.0",
"LicenseFile": "PSL-LICENSE.txt", "LicenseFile": "PSL-LICENSE.txt",
"LicenseId": "MPL-2.0", "LicenseId": "MPL-2.0",
"Copyright": "The list was originally provided by Jo Hermans <jo.hermans@gmail.com>. "Copyright": "The list was originally provided by Jo Hermans <jo.hermans@gmail.com>.\nIt is now maintained on github (https://github.com/publicsuffix/list)."
It is now maintained on github (https://github.com/publicsuffix/list)."
}, },
{ {
"Id": "libpsl", "Id": "libpsl",

View File

@ -8,6 +8,5 @@
"Description": "MD5 message-digest algorithm.", "Description": "MD5 message-digest algorithm.",
"License": "Public Domain", "License": "Public Domain",
"LicenseId": "CC0-1.0", "LicenseId": "CC0-1.0",
"Copyright": "Written by Colin Plumb in 1993, no copyright is claimed. "Copyright": "Written by Colin Plumb in 1993, no copyright is claimed. Ian Jackson <ian@chiark.greenend.org.uk>."
Ian Jackson <ian@chiark.greenend.org.uk>."
} }

View File

@ -13,8 +13,8 @@
"License": "BSD 3-clause \"New\" or \"Revised\" License with PCRE2 binary-like Packages Exception", "License": "BSD 3-clause \"New\" or \"Revised\" License with PCRE2 binary-like Packages Exception",
"LicenseId": "LicenseRef-BSD-3-Clause-with-PCRE2-Binary-Like-Packages-Exception", "LicenseId": "LicenseRef-BSD-3-Clause-with-PCRE2-Binary-Like-Packages-Exception",
"LicenseFile": "LICENCE", "LicenseFile": "LICENCE",
"Copyright": "Copyright (c) 1997-2022 University of Cambridge "Copyright": ["Copyright (c) 1997-2022 University of Cambridge",
Copyright (c) 2010-2022 Zoltan Herczeg" "Copyright (c) 2010-2022 Zoltan Herczeg"]
}, },
{ {
"Id": "pcre2-sljit", "Id": "pcre2-sljit",

View File

@ -8,6 +8,6 @@
"Homepage": "http://www.dominik-reichl.de/projects/csha1/", "Homepage": "http://www.dominik-reichl.de/projects/csha1/",
"License": "Public Domain", "License": "Public Domain",
"LicenseId": "LicenseRef-SHA1-Public-Domain", "LicenseId": "LicenseRef-SHA1-Public-Domain",
"Copyright": "Copyright (C) Dominik Reichl <dominik.reichl@t-online.de> "Copyright": ["Copyright (C) Dominik Reichl <dominik.reichl@t-online.de>",
Copyright (C) 2016 The Qt Company Ltd" "Copyright (C) 2016 The Qt Company Ltd"]
} }

View File

@ -39,9 +39,7 @@
"License": "Creative Commons Zero v1.0 Universal", "License": "Creative Commons Zero v1.0 Universal",
"LicenseId": "CC0-1.0", "LicenseId": "CC0-1.0",
"LicenseFile": "CC0_LICENSE", "LicenseFile": "CC0_LICENSE",
"Copyright": "Guido Bertoni, Joan Daemen, Michaël Peeters and Gilles Van Assche. "Copyright": "Guido Bertoni, Joan Daemen, Michaël Peeters and Gilles Van Assche.\nTo the extent possible under law, the implementers have waived all copyright
To the extent possible under law, the implementers have waived all copyright
and related or neighboring rights to the source code in this file." and related or neighboring rights to the source code in this file."
} }
] ]

View File

@ -27,8 +27,8 @@
"License": "Bitstream Vera Font License", "License": "Bitstream Vera Font License",
"LicenseId": "urn:dje:license:bitstream", "LicenseId": "urn:dje:license:bitstream",
"LicenseFile": "DEJAVU-LICENSE", "LicenseFile": "DEJAVU-LICENSE",
"Copyright": "Copyright (c) 2003 by Bitstream, Inc "Copyright": ["Copyright (c) 2003 by Bitstream, Inc",
Copyright (c) 2006 by Tavmjong Bah "Copyright (c) 2006 by Tavmjong Bah",
(c) American Mathematical Society" "(c) American Mathematical Society"]
} }
] ]

View File

@ -10,5 +10,7 @@
"License": "MIT License", "License": "MIT License",
"LicenseId": "MIT", "LicenseId": "MIT",
"LicenseFile": "LICENSE", "LicenseFile": "LICENSE",
"Copyright": "Copyright (C) 2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett.\nCopyright (C) 2006 Peter Hutterer\nCopyright (C) 2013 Daniel Martin" "Copyright": ["Copyright (C) 2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett.",
"Copyright (C) 2006 Peter Hutterer",
"Copyright (C) 2013 Daniel Martin"]
} }

View File

@ -13,6 +13,6 @@
"LicenseFile": "LIBDBUS-1-LICENSE.txt", "LicenseFile": "LIBDBUS-1-LICENSE.txt",
"Comment": "Fragments from various upstream files, see comments in ...", "Comment": "Fragments from various upstream files, see comments in ...",
"Files": "dbus_minimal_p.h", "Files": "dbus_minimal_p.h",
"Copyright": "Copyright (C) 2002, 2003 CodeFactory AB "Copyright": ["Copyright (C) 2002, 2003 CodeFactory AB",
Copyright (C) 2004, 2005 Red Hat, Inc." "Copyright (C) 2004, 2005 Red Hat, Inc."]
} }

View File

@ -24,9 +24,9 @@
"LicenseId": "BSD-2-Clause AND Imlib2", "LicenseId": "BSD-2-Clause AND Imlib2",
"License": "BSD 2-clause \"Simplified\" License and Imlib2 License", "License": "BSD 2-clause \"Simplified\" License and Imlib2 License",
"LicenseFile": "QIMAGETRANSFORM_LICENSE.txt", "LicenseFile": "QIMAGETRANSFORM_LICENSE.txt",
"Copyright": "Copyright (C) 2004, 2005 Daniel M. Duley. "Copyright": ["Copyright (C) 2004, 2005 Daniel M. Duley.",
(C) Carsten Haitzler and various contributors. "(C) Carsten Haitzler and various contributors.",
(C) Willem Monsuwe <willem@stack.nl>" "(C) Willem Monsuwe <willem@stack.nl>"]
}, },
{ {
"Id": "xserverhelper", "Id": "xserverhelper",
@ -40,7 +40,7 @@
"License": "X11 License and Historical Permission Notice and Disclaimer", "License": "X11 License and Historical Permission Notice and Disclaimer",
"LicenseId": "X11 AND HPND", "LicenseId": "X11 AND HPND",
"LicenseFile": "XCONSORTIUM_LICENSE.txt", "LicenseFile": "XCONSORTIUM_LICENSE.txt",
"Copyright": "Copyright (c) 1987, 1988 X Consortium "Copyright": ["Copyright (c) 1987, 1988 X Consortium",
Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts." "Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts."]
} }
] ]

View File

@ -13,8 +13,8 @@
"License": "BSD 4-clause \"Original\" or \"Old\" License", "License": "BSD 4-clause \"Original\" or \"Old\" License",
"LicenseId": "BSD-4-Clause", "LicenseId": "BSD-4-Clause",
"LicenseFile": "VALGRIND_LICENSE.txt", "LicenseFile": "VALGRIND_LICENSE.txt",
"Copyright": "Copyright (C) 2000-2017 Julian Seward "Copyright": ["Copyright (C) 2000-2017 Julian Seward",
Copyright (C) 2003-2017 Josef Weidendorfer." "Copyright (C) 2003-2017 Josef Weidendorfer."]
}, },
{ {
"Id": "cycle", "Id": "cycle",
@ -27,8 +27,8 @@ Copyright (C) 2003-2017 Josef Weidendorfer."
"License": "MIT License", "License": "MIT License",
"LicenseId": "MIT", "LicenseId": "MIT",
"LicenseFile": "CYCLE_LICENSE.txt", "LicenseFile": "CYCLE_LICENSE.txt",
"Copyright": "Copyright (c) 2003, 2006 Matteo Frigo "Copyright": ["Copyright (c) 2003, 2006 Matteo Frigo",
Copyright (c) 2003, 2006 Massachusetts Institute of Technology" "Copyright (c) 2003, 2006 Massachusetts Institute of Technology"]
}, },
{ {
"Id": "linuxperf", "Id": "linuxperf",
@ -43,8 +43,8 @@ Copyright (c) 2003, 2006 Massachusetts Institute of Technology"
"License": "GNU General Public License v2.0 only with Linux Syscall Note", "License": "GNU General Public License v2.0 only with Linux Syscall Note",
"LicenseId": "GPL-2.0-only WITH Linux-syscall-note", "LicenseId": "GPL-2.0-only WITH Linux-syscall-note",
"LicenseFile": "LINUX_LICENSE.txt", "LicenseFile": "LINUX_LICENSE.txt",
"Copyright": "Copyright (C) 2008-2009, Thomas Gleixner <tglx@linutronix.de> "Copyright": ["Copyright (C) 2008-2009, Thomas Gleixner <tglx@linutronix.de>",
Copyright (C) 2008-2011, Red Hat, Inc., Ingo Molnar "Copyright (C) 2008-2011, Red Hat, Inc., Ingo Molnar",
Copyright (C) 2008-2011, Red Hat, Inc., Peter Zijlstra" "Copyright (C) 2008-2011, Red Hat, Inc., Peter Zijlstra"]
} }
] ]