[debian-edu-commits] debian-edu/debian-edu-doc.git (#79) - wheezy (branch) updated: 0.4.20070715-8-g2ba0f74

[David Prévot]

The branch, wheezy has been updated
       via  2ba0f74b0b3c83abf2df482a8745356d0256015c (commit)
      from  7d15cc14cc36efbb3a8046f7008310b1c77e86aa (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 |    1 +
 debian/copyright |   31 +++++++++++++++++++++++++++++++
 debian/rules     |    2 +-
 todo             |   12 +++++-------
 4 files changed, 38 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 429a400..0593a2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ debian-edu-doc (0.4.20070716) unstable; urgency=low
   [Holger Levsen]
   * include ITIL book again, as thanks to Knut Yrvin the licence situation has
     been cleared.
+  * include copyright statement for release-manual in debian/copyright
 
  -- Holger Levsen <holger at debian.org>  Sun, 15 Jul 2007 11:07:32 +0200
 
diff --git a/debian/copyright b/debian/copyright
index ec1861d..aac2978 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,6 +10,37 @@ found in the file '/usr/share/common-licenses/GPL'.
 
 ----------------------------------------------------------------------------
 
+The files in /usr/share/doc/debian-edu-doc/en/release-manual/ are 
+Copyright 2007 by Holger Levsen (holger at debian.org) and are licenced 
+under the GNU Public Licence.
+
+The translated files in /usr/share/doc/debian-edu-doc/es/release-manual/ are 
+Copyright 2007 by José L. Redrejo Rodríguez <jredrejo at edu.juntaextremadura.net> 
+and are licenced under the GNU Public Licence.
+
+The translated files in /usr/share/doc/debian-edu-doc/nb/release-manual/ are 
+Copyright 2007 by Petter Reinholdtsen <pere at hungry.com> and are 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'.
+
+----------------------------------------------------------------------------
+
 The files in /usr/share/doc/debian-edu-doc/$lang/architecture/ are 
 Copyright 2002 by Petter Reinholdtsen (pere at hungry.com) and are licenced 
 under the GNU Public Licence.
diff --git a/debian/rules b/debian/rules
index cf27973..19fbcce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 DESTDIR := $(shell pwd)/debian/debian-edu-doc
 SRCDIR  = documentation
 DESTPATH = /usr/share/doc/debian-edu-doc
-REVISION= "{2007-07-14}"
+REVISION= "{2007-07-15}"
 TMPSRC:=$(CURDIR)/documentation/tmp
 
 SVNBASE=svn://svn.skolelinux.org/skolelinux/trunk
diff --git a/todo b/todo
index 84778b2..5ab2681 100644
--- a/todo
+++ b/todo
@@ -25,8 +25,9 @@ so the plan for the docs on svn.d.n is:
 - architecture documents
 	- make after svn co doesnt work
 	- broken umlauts in de and pt_BR
-	- holger thinks we should copy the contents to http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/Architecture 
-	  and in future ship this version
+	- it should be moved to http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/Architecture
+	- but before we can do this, we need to come up with a solution to "/usr/bin/sed" the 
+	  translated strings into the image
 
 - newdriftbook
 	- currently its the driftbook, not the newdriftbook
@@ -50,11 +51,8 @@ so the plan for the docs on svn.d.n is:
 
 
 
-copyright snipplets for itil and kursbook:
-------------------------------------------
-
-The files in /usr/share/doc/debian-edu-doc/$lang/itil/ are Copyright 
-YEAR FOO and others. 
+copyright snipplets for kursbook:
+---------------------------------
 
 The files in documentation/norwegian/kurs are written and copyrighted 2003 
 by Knut Yrvin (knuty at skolelinux.no), Harald Thingelstad (harald at skolelinux.no)


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).