Hi Frans,
On Fri, Apr 26, 2019 at 06:03:45PM -0000, Debian Wiki wrote:
> The "DebianEdu/Documentation/Stretch/CopyRight" page has been changed by FransSpiesschaert:
> https://wiki.debian.org/DebianEdu/Documentation/Stretch/CopyRight?action=diff&rev1=32&rev2=33
>
> Comment:
> A matter of consistency; thanks to Allan Nordhøy
>
> - This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, 2014), Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014, 2015, 2016, 2017, 2018), Bernhard Hammes (2012) and Joe Hansen (2015) and is released under the GPL2 or any later version. Enjoy!
> + This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014), Daniel Heß (2007), Patrick Winnertz (2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen (2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy (2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012, 2014), Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David Prévot (2012), Wolfgang Schweer (2012, 2013, 2014, 2015, 2016, 2017, 2018), Bernhard Hammes (2012) and Joe Hansen (2015) and is released under the GPL v2 or any later version. Enjoy!
(the diff is at the end of this long line, "GPL2" vs "GPL v2", and I
like it in principil...)
however, this change breaks the 'make update-copyright' target:
debian-work:~/Projects/debian-edu/git/debian-edu-doc$ schroot make update-copyright
make -C /home/user/Projects/debian-edu/git/debian-edu-doc/documentation/debian-edu-stretch update-copyright
make[1]: Entering directory '/home/user/Projects/debian-edu/git/debian-edu-doc/documentation/debian-edu-stretch'
../scripts/get_copyright DebianEdu/Documentation/Stretch debian-edu-stretch-manual
Fetching https://wiki.debian.org/DebianEdu/Documentation/Stretch/CopyRight
make[1]: Leaving directory '/home/user/Projects/debian-edu/git/debian-edu-doc/documentation/debian-edu-stretch'
make -C /home/user/Projects/debian-edu/git/debian-edu-doc/documentation/debian-edu-buster update-copyright
make[1]: Entering directory '/home/user/Projects/debian-edu/git/debian-edu-doc/documentation/debian-edu-buster'
../scripts/get_copyright DebianEdu/Documentation/Buster debian-edu-buster-manual
Fetching https://wiki.debian.org/DebianEdu/Documentation/Buster/CopyRight
make[1]: Leaving directory '/home/user/Projects/debian-edu/git/debian-edu-doc/documentation/debian-edu-buster'
make -C /home/user/Projects/debian-edu/git/debian-edu-doc/documentation/rosegarden update-copyright
make[1]: Entering directory '/home/user/Projects/debian-edu/git/debian-edu-doc/documentation/rosegarden'
../scripts/get_copyright DebianEdu/Documentation/Manuals/Rosegarden rosegarden-manual
Fetching https://wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden/CopyRight
make[1]: Leaving directory '/home/user/Projects/debian-edu/git/debian-edu-doc/documentation/rosegarden'
make -C /home/user/Projects/debian-edu/git/debian-edu-doc/documentation/audacity update-copyright
make[1]: Entering directory '/home/user/Projects/debian-edu/git/debian-edu-doc/documentation/audacity'
../scripts/get_copyright DebianEdu/Documentation/Manuals/Audacity audacity-manual
Fetching https://wiki.debian.org/DebianEdu/Documentation/Manuals/Audacity/CopyRight
make[1]: Leaving directory '/home/user/Projects/debian-edu/git/debian-edu-doc/documentation/audacity'
make -C /home/user/Projects/debian-edu/git/debian-edu-doc/documentation/debian-edu-itil update-copyright
make[1]: Entering directory '/home/user/Projects/debian-edu/git/debian-edu-doc/documentation/debian-edu-itil'
../scripts/get_copyright DebianEdu/Documentation/ITIL debian-edu-itil-manual
Fetching https://wiki.debian.org/DebianEdu/Documentation/ITIL/CopyRight
make[1]: Leaving directory '/home/user/Projects/debian-edu/git/debian-edu-doc/documentation/debian-edu-itil'
cat debian/copyright.packaging \
/home/user/Projects/debian-edu/git/debian-edu-doc/documentation/*/copyright.manual \
debian/copyright.licence \
> debian/copyright
rm documentation/*/copyright.manual
debian-work:~/Projects/debian-edu/git/debian-edu-doc$ git diff
diff --git a/debian/copyright b/debian/copyright
index 4500dc2e..ce62d8d2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -256,34 +256,6 @@ Files: documentation/debian-edu-itil/debian-edu-itil-manual.zh_Hant.po
Copyright: 2019 Louies
License: GPL-2+
-Files: documentation/debian-edu-stretch/debian-edu-stretch-manual.xml documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
-Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Holger Levsen
- 2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014 Petter Reinholdtsen
- 2007 Daniel Heß
- 2007 Patrick Winnertz
- 2007 Knut Yrvin
- 2007 Ralf Gesellensetter
- 2007 Ronny Aasen
- 2007 Morten Werner Forsbring
- 2007, 2008 Bjarne Nielsen
- 2007 Nigel Barker
- 2007 José L. Redrejo Rodríguez
- 2007 John Bildoy
- 2008 Joakim Seeberg
- 2009, 2010, 2011, 2012, 2014 Jürgen Leibner
- 2009 Oded Naveh
- 2009, 2010 Philipp Hübner
- 2010 Andreas Mundt
- 2010, 2012 Olivier Vitrat
- 2010 Vagrant Cascadian
- 2011 Mike Gabriel
- 2012 Justin B Rye
- 2012 David Prévot
- 2012, 2013, 2014, 2015, 2016, 2017, 2018 Wolfgang Schweer
- 2012 Bernhard Hammes
- 2015 Joe Hansen
-License: GPL-2+
-
Files: documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
Copyright: 2007 José L. Redrejo Rodríguez
2009, 2010, 2011, 2012, 2015 Rafael Rivas
which surprises me a bit, because looking at lines 77 and 88 of
documentation/scripts/get_copyright there should be support for
this way of writing. (I'm just too tired right now to grok perl.)
I was thinking of leaving this as it is over the weekend then reverting
the change on Monday if no fix has been found, but then I realized that the
Stretch manual was changed, not the Buster one. Such/any changes at the moment
should be done for the Buster manual first, and then maybe ported to the
Stretch manual, if useful.
The next d-e-doc upload is scheduled to happen this coming Wednesday.
--
tschau,
Holger
-------------------------------------------------------------------------------
holger@(debian|reproducible-builds|layer-acht).org
PGP fingerprint: B8BF 5413 7B09 D35C F026 FE9D 091A B856 069A AA1C
Our civilization is being sacrificed for the opportunity of a very small number
of people to continue making enormous amounts of money... It is the sufferings
of the many which pay for the luxuries of the few... You say you love your
children above all else, and yet you are stealing their future in front of
their very eyes...
Attachment:
signature.asc
Description: PGP signature