[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] Update debian/copyright from the wikis.

[Holger Levsen]

Holger Levsen pushed to branch master at Debian Edu / debian-edu-doc


Commits:
18da279b by Holger Levsen at 2021-03-17T18:38:46+01:00
Update debian/copyright from the wikis.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- debian/changelog
- debian/copyright


Changes:

=====================================
debian/changelog
=====================================
@@ -2,6 +2,7 @@ debian-edu-doc (2.11.21) UNRELEASED; urgency=medium
 
   * Update Debian Edu Bullseye manual from the wiki.
     - newly completed translation: Portuguese.
+  * Update debian/copyright from the wikis.
 
   [ Translation updates ]
   * Bullseye manual:
@@ -22,6 +23,9 @@ debian-edu-doc (2.11.21) UNRELEASED; urgency=medium
   [ Frans Spiesschaert ]
   * Bullseye manual: Add Dutch screenshots.
 
+  [ Wolfgang Schweer ]
+  * Fix Makefile to not break debian/copyright for older manuals.
+
  -- Holger Levsen <holger at debian.org>  Tue, 02 Mar 2021 00:19:55 +0100
 
 debian-edu-doc (2.11.20) unstable; urgency=medium


=====================================
debian/copyright
=====================================
@@ -10,7 +10,7 @@ Copyright: 2007 Petter Reinholdtsen <pere at hungry.com>
 License: GPL-2+
 
 Files: debian/*
-Copyright:  2006-2021 Holger Levsen <holger at debian.org>
+Copyright:  2006-2020 Holger Levsen <holger at debian.org>
   2004-2007 Mari Wang <mariwan at ifi.uio.no>
   2004-2007 Steffen Jöris <Steffen.Joeris at skolelinux.de>
   2004-2007 Frode Jemtland <frode.jemtland at skolelinux.no>
@@ -33,7 +33,7 @@ Files: documentation/common/Makefile.common
 Copyright: 2012 David Prévot <taffit at debian.org>
   2014 Petter Reinholdtsen <pere at hungry.com>
   2014, 2020 Holger Levsen <holger at debian.org>
-  2014, 2016, 2018-2020 Wolfgang Schweer <wschweer at arcor.de>
+  2014, 2016, 2018-2021 Wolfgang Schweer <wschweer at arcor.de>
 License: GPL-2+
 
 Files: documentation/common/edu.css.xml
@@ -79,7 +79,7 @@ Copyright: 2007-2009 Holger Levsen <holger at debian.org>
   2007 José L. Redrejo Rodríguez
   2007 John Bildoy
   2012 Jürgen Leibner
-  2017-2020 Wolfgang Schweer <wschweer at arcor.de>
+  2017-2021 Wolfgang Schweer <wschweer at arcor.de>
 License: GPL-2+
 
 Files: documentation/rosegarden/po4a.cfg documentation/audacity/po4a.cfg
@@ -96,7 +96,8 @@ Copyright: 2012 David Prévot <taffit at debian.org>
 License: GPL-2+
 
 Files: documentation/debian-edu-*/source/Debian_Edu_Network*.odg
-Copyright: 2017, 2018 Wolfgang Schweer <wschweer at arcor.de>
+Copyright: 2011 Jürgen Leibner
+  2017, 2018, 2021 Wolfgang Schweer <wschweer at arcor.de>
 License: GPL-2+
 
 Files: documentation/audacity/audacity-manual.*.po documentation/audacity/audacity-manual.*.add
@@ -104,7 +105,7 @@ Copyright: Various translators, names contained in the related Po4a addendum fil
 License: GPL-2+
 
 Files: documentation/debian-edu-bullseye/debian-edu-bullseye-manual.*.po documentation/debian-edu-bullseye/debian-edu-bullseye-manual.*.add
-Copyright: Various translators, names contained in the related Po4a addendum fils.
+Copyright: Various translators, names contained in the related Po4a addendum file.
 License: GPL-2+
 
 Files: documentation/debian-edu-buster/debian-edu-buster-manual.*.po documentation/debian-edu-buster/debian-edu-buster-manual.*.add
@@ -125,7 +126,7 @@ Copyright: 2008, 2009 Alf Tonny Bätz
 License: GPL-2+
 
 Files: documentation/debian-edu-bullseye/debian-edu-bullseye-manual.xml documentation/debian-edu-bullseye/debian-edu-bullseye-manual-stripped.xml documentation/debian-edu-bullseye/source/AllInOne-debian-edu-bullseye-manual.xml documentation/debian-edu-bullseye/debian-edu-bullseye-manual.pot
-Copyright: 2007-2020 Holger Levsen
+Copyright: 2007-2021 Holger Levsen
   2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012, 2014 Petter Reinholdtsen
   2007 Daniel Heß
   2007 Patrick Winnertz
@@ -147,7 +148,7 @@ Copyright: 2007-2020 Holger Levsen
   2011 Mike Gabriel
   2012 Justin B Rye
   2012 David Prévot
-  2012-2020 Wolfgang Schweer
+  2012-2021 Wolfgang Schweer
   2012 Bernhard Hammes
   2015 Joe Hansen
 License: GPL-2+



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/18da279b14d56a59a0b651b8bbd1b98cf663de70

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/commit/18da279b14d56a59a0b651b8bbd1b98cf663de70
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20210317/5a4a54a5/attachment-0001.htm>