From df4c1ac57a1356730c8a4b04b384109f96892338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20COUDERC?= Date: Tue, 9 Dec 2014 22:43:38 +0000 Subject: [PATCH] Another review of the copyright file --- debian/copyright | 53 ++++++++++++++----------------- plymouth/spacefun/spacefun.script | 2 +- 2 files changed, 24 insertions(+), 31 deletions(-) diff --git a/debian/copyright b/debian/copyright index 21f6830..b81c9a7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -46,6 +46,9 @@ They are based on the Debian “Open Use” Logo (without the “Debian” label The .desktop files included in this package were compiled by Colin Walters . +icons/*/emblems/emblem-debian.{png,svg} are different versions of the Debian +“Open Use” Logo (without the “Debian” label). + The Lines theme is © 2014 Juliette Taka Belin and released under the GPLv2 or any later version. @@ -56,63 +59,53 @@ The Lines plymouth script is Copyright © 2009 Canonical Ltd., Copyright © 2010-2014 Aurélien Couderc, Copyright © 2012 Jonathan Carter, Copyright © 2014 Juliette Taka Belin under the GPLv2 or any later version. -The images used with the Lines plymouth theme are Copyright © 2014 Juliette -Taka Belin under the GPLv2 or any later version. +The Lines KDM script is © 2012 Eshat Cakar, © 2014 Aurélien Couderc under the +GPLv2 or any later version. -The Lines KDM theme is © 2014 Aurélien Couderc GPLv3 with artwork from -Juliette Taka Belin under the GPLv2 or any later version. +The artwork for the Lines KDM theme © 2014 Juliette Taka Belin and © 2012 +Eshet Cakar under the GPLv2 or any later version. -The icons for the Lines KDM theme (user, password, system, shutdown) are from -Adrien Aubourg under the GPLv3 license. +The Lines KSplash script is © 2013 Martin Klapetek, © 2014 Aurélien Couderc +under the GPLv2 or any later version. -The Lines KSplash theme is © 2013 Martin Klapetek, © 2014 Aurélien Couderc -under the GPLv2 with artwork from Juliette Taka Belin, Nuno Pinheiro under the -GPLv2 license. +The artwork for the Lines KSplash theme is © 2014 Juliette Taka Belin under +the GPLv2 or any later version and © 2007-2014 from the Oxygen Icon Theme +contributors under the LGPLv3 or any later version. -The Joy theme is © 2012 Adrien Aubourg and released under the GPLv3 -license. +The Joy theme is © 2012 Adrien Aubourg and released under the GPLv2 or any +later version. The Joy theme is based on the Debian “Open Use” Logo (without the “Debian” label). The Joy plymouth script is Copyright © 2009 Canonical Ltd., Copyright © 2010 Aurélien Couderc and Copyright © 2012 Jonathan Carter under -the GPLv2+. - -The images used with the Joy plymouth theme are Copyright © 2012 Adrien Aubourg -under the GPLv3 License. +the GPLv2 or any later version. The Joy GDM is © 2012 Paul Tagliamonte GPLv2, with work from all the previous authors of that file, and artwork from Adrien Aubourg under -the GPLv3 license. +the GPLv2 or any later version. -The Joy KDM theme is © 2012 Eshat Cakar and © 2010 Roman Shtylman GPLv2 -with artwork from Adrien Aubourg under the GPLv3 license. +The Joy KDM theme is © 2012 Eshat Cakar and © 2010 Roman Shtylman GPLv2 +with artwork from Adrien Aubourg under the GPLv2 or any later version. The Joy KSplash theme is © 2012 Eshat Cakar, Nuno Pinheiro, Riccardo Iaconelli GPLv2 -with artwork from Adrien Aubourg under the GPLv3 license. - -The Joy grub theme is © 2012 Paul Tagliamonte GPLv2, using artwork from Adrien -Aubourg licensed under GPLv3 license. +with artwork from Adrien Aubourg under the GPLv2 or any later version. The SpaceFun theme is © 2010 Valessio S. Brito and released under the GPLv2. -The Splashy theme is © 2010 Yves-Alexis Perez using artwork from Valessio -S. Brito, and are released under GPLv2. - -Spacefun plymouth theme is © 2010 Aurelien Couderc and released under the GPLv3 -license, using artwork from Valessio S. Brito. The SpaceFun theme is based on the Debian “Open Use” Logo (without the “Debian” label). +The Spacefun plymouth script is © 2010 Aurelien Couderc and released under the +GPLv2 or any later version, using artwork from Valessio S. Brito under the +GPLv2. + Moreblue Orbit theme (moreblue-orbit-splash, moreblue-orbit-grub and moreblue-orbit-wallpaper) is © 2008 Andre Ferreira and released under the GPLv2. It is based on the Debian “Open Use” Logo (without the “Debian” label). The GDM theme authors are Andre Ferreira, Fathi Boudra and Valessio S. Brito. -icons/*/emblems/emblem-debian.{png,svg} are different versions of the Debian -“Open Use” Logo (without the “Debian” label). - The GPL license (version 2) can be found in plain text format, on Debian systems, at /usr/share/common-licenses/GPL-2 diff --git a/plymouth/spacefun/spacefun.script b/plymouth/spacefun/spacefun.script index bd1e659..753e5f8 100644 --- a/plymouth/spacefun/spacefun.script +++ b/plymouth/spacefun/spacefun.script @@ -8,7 +8,7 @@ # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or +# the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful,