[debian-edu-commits] debian-edu/ 03/03: Update debian/copyright from the wikis using the update-copyright target.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-doc.

commit 1853a4ac90077e224a7c9366dfb7bde8f399fc13
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Dec 19 21:00:28 2014 +0000

    Update debian/copyright from the wikis using the update-copyright target.
---
 debian/changelog |  4 ++++
 debian/copyright | 14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c7968c7..35514bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ debian-edu-doc (1.6~20141224~8.0+edu0~alpha1) UNRELEASED; urgency=medium
     Aanesen, Knut Yrvin, Stefan Mitchell-Lauridsen, Ragnar Wisløff,
     FourFire Le'bard.
 
+  [ Holger Levsen ]
+  * Update debian/copyright from the wikis using the update-copyright
+    target.
+
  -- Holger Levsen <holger at debian.org>  Wed, 03 Dec 2014 21:26:09 +0100
 
 debian-edu-doc (1.6~20141203~8.0+edu0~alpha1) unstable; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index c55a811..b1092cd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -97,13 +97,17 @@ Copyright: 2007 José L. Redrejo Rodríguez
 License: GPL-2+
 
 Files: documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
-Copyright: 2007 Petter Reinholdtsen
-  2007, 2008 Håvard Korsvoll
+Copyright: 2007, 2012, 2014 Petter Reinholdtsen
+  2007-2009 Håvard Korsvoll
   2008 Tore Skogly
   2010 Ole-Anders Andreassen
   2010 Jan Roar Rød
   2014 Ole-Erik Yrvin
-  2014 Ingrid Yrvin
+  2014) Hans Arthur Kielland Aanesen (2014 Ingrid Yrvin
+  2014 Knut Yrvin
+  2014 FourFire Le'bard
+  2014  Stefan Mitchell-Lauridsen
+  2014 Ragnar Wisløff
 License: GPL-2+
 
 Files: documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -246,6 +250,10 @@ Files: documentation/rosegarden/rosegarden-manual.nl.po
 Copyright: 2014 Frans Spiesschaert
 License: GPL-2+
 
+Files: documentation/rosegarden/rosegarden-manual.es.po
+Copyright: 2011, 2011 Rafael Rivas
+License: GPL-2+
+
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git