[debian-edu-commits] debian-edu/debian-edu-doc.git (#442) - wheezy (branch) updated: 1.1_20080706-13-ga731299

Sat Oct 5 12:18:07 UTC 2013

The branch, wheezy has been updated
       via  a7312997844ad9b6e2d5057548ddf0e51ed91bf4 (commit)
      from  3b1d32220a571ffe305f4d25c636f8cdc9a1eb90 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |   10 +--
 debian/control   |    5 +-
 debian/copyright |  180 ++++++++++++++++++++++++++++--------------------------
 todo             |    2 -
 4 files changed, 104 insertions(+), 93 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index a249ae0..177979e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
-debian-edu-doc (1.2~20080712) unstable; urgency=low
+debian-edu-doc (1.2~20080712) terra; urgency=low
 
-  * Add rosegarden manual by Alf Tonny Bätz.
+  * Add rosegarden manual by Alf Tonny Bät to debian-edu-doc-en and
+    debian-edu-doc-nb.
   * release-manual:
     - update .xml source from the wiki.
     - update Italian translation thanks to Claudio Carboncini.
- 
- -- Holger Levsen <holger at debian.org>  Sat, 12 Jul 2008 15:41:23 +0200
+  * Use http://wiki.debian.org/Proposals/CopyrightFormat for debian/copyright.
+
+ -- Holger Levsen <holger at debian.org>  Sat, 12 Jul 2008 20:18:07 +0000
 
 debian-edu-doc (1.1~20080706) terra; urgency=low
 
diff --git a/debian/control b/debian/control
index 6503880..3fb8628 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Priority: optional
 Architecture: all
 Description: English documentation from the Debian Edu project
  The English version of the release manual from the Debian Edu / Skolelinux
- project is included in this package.
+ project is included in this package, as well as the rosegarden manual.
  .
  Debian Edu is a Debian project to make the best distribution for educational
  purposes. Skolelinux is the name of the Custom Debian Distribution which is
@@ -71,7 +71,8 @@ Depends: debian-edu-doc-en
 Architecture: all
 Description: Bokmal documentation from the Debian Edu project
  The Bokmal version of the release manual from the Debian Edu / Skolelinux
- project is included in this package, as well as the ITIL documentation.
+ project is included in this package, as well as the ITIL documentation and the
+ rosegarden manual.
  .
  Debian Edu is a Debian project to make the best distribution for educational
  purposes. Skolelinux is the name of the Custom Debian Distribution which is
diff --git a/debian/copyright b/debian/copyright
index c63b9d7..7775b8e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,86 +1,96 @@
-This is the debian-edu-doc package. 
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Name: debian-edu-doc
+Upstream-Source: svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc
+
+Files: documentation/itil/*.xml
+Copyright: Copyright 2005 Knut Yrvin (knuty at skolelinux.no)
+ Copyright 2005 Andreas Johnsen (andreasj at skolelinux.no)
+ Copyright 2005 Klaus Ade Johnstad (klaus at skolelinux.no)
+ Copyright 2005 Finn-Arne Johansen <faj at bzz.no>
+License: GPL-2+
+ On Debian systems the full text of the GNU General Public License 2 can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
+
+Files: documentation/rosegarden/rosegarden.xml
+Copyright: Copyright 2008 Alf Tonny Bätz <alfton at gmail.com> 
+ Copyright 2008 Holger Levsen <holger at debian.org>
+License: GPL-2+
+ On Debian systems the full text of the GNU General Public License 2 can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
+
+Files: documentation/rosegarden/images/*
+Copyright: Copyright 2008 Alf Tonny Bätz <alfton at gmail.com> 
+License: GPL-2+
+ On Debian systems the full text of the GNU General Public License 2 can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
+
+Files: documentation/rosegarden/rosegarden.nb.po
+Copyright: Copyright 2008 Alf Tonny Bätz <alfton at gmail.com> 
+License: GPL-2+
+ On Debian systems the full text of the GNU General Public License 2 can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
+
+Files: documentation/release-manual/release-manual.xml, documentation/release-manual/images/*
+Copyright: Copyright 2007-2008 Holger Levsen <holger at debian.org>
+ Copyright 2007-2008 Petter Reinholdtsen
+ Copyright 2007 Daniel Heß
+ Copyright 2007 Patrick Winnertz
+ Copyright 2007 Knut Yrvin
+ Copyright 2007 Ralf Gesellensetter
+ Copyright 2007 Ronny Aasen
+ Copyright 2007 Morten Werner Forsbring
+ Copyright 2007-2008 Bjarne Nielsen
+ Copyright 2007 Nigel Barker
+ Copyright 2007 José L. Redrejo Rodríguez
+ Copyright 2007 John Bildoy
+ Copyright 2008 Joakim Seeberg
+License: GPL-2+
+ On Debian systems the full text of the GNU General Public License 2 can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
+
+Files: documentation/release-manual/release-manual.es.po
+Copyright: Copyright 2007 José L. Redrejo Rodríguez
+License: GPL-2+
+ On Debian systems the full text of the GNU General Public License 2 can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
+
+Files: documentation/release-manual/release-manual.nb.po
+Copyright: Copyright 2007 Petter Reinholdtsen (2007)
+ Copyright 2007-2008 Håvard Korsvoll
+License: GPL-2+
+ On Debian systems the full text of the GNU General Public License 2 can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
+
+Files: documentation/release-manual/release-manual.de.po
+Copyright: Copyright 2007 Holger Levsen
+ Copyright 2007 Patrick Winnertz
+ Copyright 2007 Ralf Gesellensetter
+ Copyright 2007-2008 Roland F. Teichert
+ Copyright 2007 Jürgen Leibner
+ Copyright 2008 Ludger Sicking
+ Copyright 2008 Kai Hatje
+License: GPL-2+
+ On Debian systems the full text of the GNU General Public License 2 can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
+
+Files: documentation/release-manual/release-manual.it.po
+Copyright: Copyright 2007-2008 Claudio Carboncini
+License: GPL-2+
+ On Debian systems the full text of the GNU General Public License 2 can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
+
+Files: documentation/release-manual/release-manual.fr.po
+Copyright: Copyright 2008 Christophe Masson
+License: GPL-2+
+ On Debian systems the full text of the GNU General Public License 2 can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
+
+Files: debian/*
+Copyright: Copyright 2004-2007 by Mari Wang <mariwan at ifi.uio.no> 
+ Copyright 2004-2007 Steffen Jöris <Steffen.Joeris at skolelinux.de>
+ Copyright 2004-2007 Frode Jemtland <frode.jemtland at skolelinux.no>
+ Copyright 2006-2008 Holger Levsen <holger at debian.org>
+License: GPL-2+
+ On Debian systems the full text of the GNU General Public License 2 can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
 
-The packaging is Copyright 2004-2007 by Mari Wang <mariwan at ifi.uio.no>, 
-Steffen Jöris <Steffen.Joeris at skolelinux.de>, Frode Jemtland 
-<frode.jemtland at skolelinux.no> and Holger Levsen <holger at debian.org>. 
-The packaging is licenced under the GNU Public Licence.
-
-On Debian systems, the complete text of the GNU General Public License can be
-found in the file '/usr/share/common-licenses/GPL'.
-
-----------------------------------------------------------------------------
-
-FIXME
-
-The files in /usr/share/doc/debian-edu-doc/en/release-manual/ are Copyright
-2007 by Holger Levsen (holger at debian.org), Petter Reinholdtsen, Daniel Heß, 
-Patrick Winnertz, Knut Yrvin, Ralf Gesellensetter, Ronny Aasen, Morten Werner 
-Forsbring and José L. Redrejo Rodrígues and is licenced under the GNU Public 
-Licence version 2 or, at your option, any later version.
-
-The translated version in /usr/share/doc/debian-edu-doc/es/release-manual/ is
-Copyright 2007 by José L. Redrejo Rodríguez <jredrejo at edu.juntaextremadura.net> 
-and is licenced under the GNU Public Licence 2 or, at your option, any later
-version.
-
-The translated version in /usr/share/doc/debian-edu-doc/nb/release-manual/ is 
-Copyright 2007 by Petter Reinholdtsen <pere at hungry.com> and Håvard Korsvoll 
-and is licenced under the GNU Public Licence version 2 or, at your option, any
-later version.
-
-The translated version in /usr/share/doc/debian-edu-doc/it/release-manual/ is 
-Copyright 2007 by Claudio Carboncini and is licenced under the GNU Public 
-Licence version 2 or, at your option, any later version.
-
-The translated version in /usr/share/doc/debian-edu-doc/de/release-manual/ is 
-Copyright 2007 by Holger Levsen, Patrick Winnertz, Ralf Gesellensetter, Roland 
-F. Teichert, Jürgen Leibner, Ludger Sicking and Kai Hatje and is licenced under
-the GNU Public Licence version 2 or, at your option, any later version.
-
-The translated version in /usr/share/doc/debian-edu-doc/fr/release-manual/ is 
-Copyright 2008 by Christophe Masson and is licenced under the GNU Public 
-Licence version 2 or, at your option, any later version.
-
-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 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-On Debian systems, the complete text of the GNU General Public License 
-version 2 can be found in the file '/usr/share/common-licenses/GPL-2'.
-
-----------------------------------------------------------------------------
-
-The ITIL book in /usr/share/doc/debian-edu-doc/$lang/itil/ was downloaded from
-http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne and is Copyright 2005 
-by Knut Yrvin (knuty at skolelinux.no), Andreas Johnsen (andreasj at skolelinux.no),
-Klaus Ade Johnstad (klaus at skolelinux.no), Finn-Arne Johansen <faj at bzz.no> 
-and is licenced under the GNU Public Licence.
-
-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 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-On Debian systems, the complete text of the GNU General Public License can be
-found in the file '/usr/share/common-licenses/GPL'.
-
-----------------------------------------------------------------------------
diff --git a/todo b/todo
index 807253c..13d737e 100644
--- a/todo
+++ b/todo
@@ -18,6 +18,4 @@ This will not be fixed for r1, but should be fixed for r2/lenny:
 	  foundation or whatever legal body we have, or to SPI or to the FSF?
 - other docs:
 	- svn://svn.skolelinux.org/repos/skolelinux/trunk/www/developer.skolelinux.no/artikler/skolelinux-do-ocracy.txt might also be interesting
-- update debian/copyright to new proposed format, include .fr translation and rosegarden manual
-- add rosegarden to descriptions in debian/control
 - remove this file :)


hooks/post-receive
-- 
debian-edu-doc.git (Debian package debian-edu-doc)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).


