[debian-edu-commits] debian-edu/debian-edu-doc.git (#106) - wheezy (branch) updated: 0.5.20070717-8-g7aaccdb
David Prévot
taffit at alioth.debian.org
Sat Oct 5 12:12:39 UTC 2013
The branch, wheezy has been updated
via 7aaccdb58f4eaacd37ae0b0b7613b23e32d5c856 (commit)
from be4f850a0de76bab0194e1b678d7e3e4d74b0e74 (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/README | 18 +++++++++---------
debian/changelog | 10 ++++++++--
debian/copyright | 30 ++++++++++++++++--------------
debian/rules | 2 +-
todo | 24 ++++++++----------------
5 files changed, 42 insertions(+), 42 deletions(-)
The diff of changes is:
diff --git a/debian/README b/debian/README
index c3e2e2b..c899195 100644
--- a/debian/README
+++ b/debian/README
@@ -1,22 +1,22 @@
Status
------
+The release-manual which is developed in a wiki at
http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/ is our new (and still
incomplete) documentation for Debian-edu etch.
-Many of the other documents are outdated, explaining sarge.
-
-Also no document builds from source - currently only what is in svn is copied,
-but the files are not build :( This makes updating the documents or trans-
-lations IMPOSSIBLE! :(
-
-The kursbook is currently disabled because it is GFDL with invarant sections.
+Most other documents don't build from source currently - so only what is in
+svn is copied. This makes updating the documents or translations impossible.
Translation status
------------------
-The architecture document is developed in english and is translated into nb de
-nl pt_BR da.
+The release-manual is translated with .po files release-manual/. It contains
+the arkitektur document.
+
+The now obsolete arkitektur document was developed in english and was
+translated into nb de nl pt_BR da. As soon as those translations are copied
+to the release-manual we will not include it anymore.
The newdriftbook is developed in english and is translated into no de pt_BR.
diff --git a/debian/changelog b/debian/changelog
index 68c97f7..25fb1f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
debian-edu-doc (0.5.20070720) unstable; urgency=low
+ [ Petter Reinholdtsen ]
+ * Remove the date as part of the file name for the itil documentation.
+
+ [ Holger Levsen ]
* release-manual: updated from the wiki
* release-manual: replace $DEBIAN_EDU_DOC_BUILDDATE with the actual build
date.
- * Remove the date as part of the file name for the itil documentation.
+ * updated README and todo
+ * added sources for documents in debian/copyright
+ * updated checkout date for the documents from svn
- -- Holger Levsen <holger at debian.org> Fri, 20 Jul 2007 21:59:53 +0200
+ -- Holger Levsen <holger at debian.org> Sat, 21 Jul 2007 00:08:36 +0200
debian-edu-doc (0.5.20070717) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 44cbcc0..1d8813e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,9 +41,9 @@ 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.
+The arkitektur documents in /usr/share/doc/debian-edu-doc/$lang/architecture/
+where downloaded from svn://svn.skolelinux.org/repos/skolelinux/trunk/www/developer.skolelinux.no/arkitektur and are Copyright 2002 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
@@ -64,11 +64,11 @@ found in the file '/usr/share/common-licenses/GPL'.
----------------------------------------------------------------------------
-The files in http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne are
-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 are licenced under the GNU Public
-Licence.
+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
@@ -89,10 +89,11 @@ found in the file '/usr/share/common-licenses/GPL'.
----------------------------------------------------------------------------
-The files in /usr/share/doc/debian-edu-doc/nb/kursdok are written and
-copyrighted 2003 by Knut Yrvin (knuty at skolelinux.no), Harald Thingelstad
-(harald at skolelinux.no) and Klaus Ade Johnstad (klaus at skolelinux.no)
-and are licenced under the GNU Public Licence.
+The files in /usr/share/doc/debian-edu-doc/nb/kursdok are where downloaded
+from svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc/documentation/norwegian/kurs/kursdok.html
+and were written and copyrighted 2003 by Knut Yrvin (knuty at skolelinux.no),
+Harald Thingelstad (harald at skolelinux.no) and Klaus Ade Johnstad
+(klaus at skolelinux.no) 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
@@ -113,8 +114,9 @@ found in the file '/usr/share/common-licenses/GPL'.
----------------------------------------------------------------------------
-The files in /usr/share/doc/debian-edu-doc/$lang/ikt-book/ are
-Copyright 2002, 2003 Vibeke Braaten, Christian Juell, Tor Harald Nordnes
+The files in /usr/share/doc/debian-edu-doc/$lang/ikt-book/ where downloaded from
+svn://svn.skolelinux.org/skolelinux/trunk/www/developer.skolelinux.no/dokumentasjon
+and are Copyright 2002, 2003 Vibeke Braaten, Christian Juell, Tor Harald Nordnes
and Truls Teigen. Permission is granted to copy, distribute and/or modify
this document under the terms of the GNU Free Documentation License,
Version 1.2 or any later version published by the Free Software Foundation;
diff --git a/debian/rules b/debian/rules
index ad10555..4233283 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
DESTDIR := $(CURDIR)/debian/debian-edu-doc
SRCDIR := $(CURDIR)/documentation
DESTPATH = /usr/share/doc/debian-edu-doc
-REVISION = "{2007-07-16}"
+REVISION = "{2007-07-20}"
SVNBASE=svn://svn.skolelinux.org/skolelinux/trunk
diff --git a/todo b/todo
index 4a28867..7f54d0d 100644
--- a/todo
+++ b/todo
@@ -6,32 +6,30 @@ so the plan for the docs on svn.d.n is:
Entries marked with (*) should be fixed before the release:
-- debian/copyright
-* - fix location of some documents
-
- debian/rules
- - do we really want to ship .txt files too? (just because we can...)
+ - we could ship .txt files as well - do we want that?
- get-orig-source is not update capable, fix that
- itil
-* - document in debian/copyright where it was downloaded from, or rather, where it ends up...
+ - also build html (and .txt) versions?
- release-manual
- links in html version are broken
- multi-page html version missing
- should we assign the copyright of the document and its translation to the skolelinux
foundation or whatever legal body we have, or to SPI or to the FSF?
-* - document in debian/copyright where it was downloaded from
- it seems the <code> tag is not understood
- architecture documents
- make after svn co doesnt work
- broken umlauts in de and pt_BR
- - 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. That looks easy: .dia files are just compressed xml
+ - it has been moved to http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/Architecture
+ but the "svn-version" should stay in the package until the translations are
+ also moved to the .po files and we way has been found to translation the image
+ automatically
+ - we need to come up with a solution to "/usr/bin/sed" the translated strings
+ into the image. That looks easy: .dia files are just compressed xml
files, so we just need to sed the strings in there :)
-* - document in debian/copyright where it was downloaded from
- newdriftbook
* - provide a README.outdated and explain there where to get it
@@ -39,10 +37,8 @@ Entries marked with (*) should be fixed before the release:
- ikt book
- make after svn co doesnt work yet: html versions incomplete (and therefore not copied at all)
- fix debian/rules (see FIXME there)
-* - document in debian/copyright where it was downloaded from
- documentation/norwegian/kurs
-* - document in debian/copyright where it was downloaded from
- knuty provided the answer...
* - document the change to GPL in the source files and the
generated document (the one we ship and currently cannot
@@ -55,7 +51,3 @@ Entries marked with (*) should be fixed before the release:
- 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).
More information about the debian-edu-commits
mailing list