[debian-edu-commits] debian-edu/debian-edu-doc.git (#29) - wheezy (branch) updated: 0c9913485afc7f7237eb0cf4d0ce2920053cc42b

[David Prévot]

The branch, wheezy has been updated
       via  0c9913485afc7f7237eb0cf4d0ce2920053cc42b (commit)
      from  8131031eff52d868e7bf5033c7c2a46991339588 (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 |    2 ++
 debian/control   |    2 +-
 debian/copyright |    6 +++++-
 debian/rules     |    9 ++++++++-
 todo             |   18 ++++++++++--------
 5 files changed, 26 insertions(+), 11 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 197d167..2aa92cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ debian-edu-doc (0.2) unstable; urgency=low
     (not finished yet)
   * checkout architecture document, ITK-book and newdriftbook from its
     svn repository with a date to define revision
+  * build itil.pdf from wiki source, thanks to moinmoin2pdf by Petter
+    Reinholdtsen
   * added build-depends to build those documents
   * english directory names (Closes: Skolelinux bug #1029)
 
diff --git a/debian/control b/debian/control
index 28a2f8a..07c6a6a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: debian-edu-doc
 Section: doc
 Priority: optional
-Build-Depends: debhelper (>= 5), poxml, ldp-docbook-xsl
+Build-Depends: debhelper (>= 5), poxml, ldp-docbook-xsl, dblatex
 Build-Depends-Indep: docbook-utils
 Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
 Uploaders: Petter Reinholdtsen <pere at debian.org>, Morten Werner Olsen <werner at debian.org>, Luk Claes <luk at debian.org>, Steffen Joeris <white at debian.org>, Holger Levsen <holger at debian.org>
diff --git a/debian/copyright b/debian/copyright
index d4d760c..d61e761 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,6 +9,10 @@ Petter Reinholdtsen and are licenced under GPL
 
 [licence text/pointer here]
 
+The files in /usr/share/doc/debian-edu-doc/$lang/newdriftbook/ are Copyright YEAR FOO and others. 
+
+[licence text/pointer here]
+
 The files in /usr/share/doc/debian-edu-doc/$lang/ikt-book/ are Copyright 2002, 2003 Vibeke Braaten, 
 Christian Juell, Tor Harald Nordnes und Truls Teigen. Permission is granted to
 copy, distribute and/or modify this document under the terms of the GNU Free 
@@ -16,7 +20,7 @@ Documentation License, Version 1.2 or any later version published by the Free
 Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no 
 Back-Cover Texts.
 
-[licence text/pointer here]
+The files in /usr/share/doc/debian-edu-doc/$lang/itil/ are Copyright YEAR FOO and others. 
 
 The files in documentation/norwegian/kurs are written and copyrighted 2003 
 by Knut Yrvin (knuty at skolelinux.no), Harald Thingelstad (harald at skolelinux.no)
diff --git a/debian/rules b/debian/rules
index da4e71b..bae0cd9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,14 @@ install: build
 		install -m 644 $(TMPSRC)/dokumentasjon/newdriftbok/images/* $(DESTDIR)$(DESTPATH)/$$i/newdriftbook/images ; \
 	done
 	#
-	# kurs (norwegian only atm)
+	# itil
+	#
+	install -d $(DESTDIR)$(DESTPATH)/no/itil
+	wget http://developer.skolelinux.no/itil/moinmoin2pdf -O $(TMPSRC)/moinmoin2pdf
+	chmod +x $(TMPSRC)/moinmoin2pdf
+	$(TMPSRC)/moinmoin2pdf http://wiki.skolelinux.no/Dokumentasjon/ITIL/Samleside  $(DESTDIR)$(DESTPATH)/no/itil/itil-$$(date +%Y-%m-%d).pdf
+	#
+	# kurs 
 	#
 	install -d $(DESTDIR)$(DESTPATH)/no/kurs
 	install -m 644 $(SRCDIR)/norwegian/kurs/kursdok* $(DESTDIR)$(DESTPATH)/no/kurs
diff --git a/todo b/todo
index 706a7d2..9a36ee7 100644
--- a/todo
+++ b/todo
@@ -9,26 +9,28 @@ so the plan for the docs on svn.d.n is:
 - architecture documents
 	- make after svn co doesnt work yet
 	- broken umlauts in de and pt_BR
-- ikt book
-	- make after svn co doesnt work yet
-	- html versions incomplete (and therefore not copied at all)
 - newdriftbook
+	- add copyright owner and licence to debian/copyright
 	- still the sarge version, start a new copy for etch
 	- make after svn co doesnt work yet
 	- images get copied for each language
+- ikt book
+	- make after svn co doesnt work yet
+	- html versions incomplete (and therefore not copied at all)
+- itil 
+	- what licence does http://wiki.skolelinux.no/Dokumentasjon/ITIL/Samleside have? maybe the same as wiki.s.no? :) ask akai or knut 
 - documentation/norwegian/kurs
-	- is that GFDL without invariant sections? 
-
-- ITIL book from wiki: http://wiki.skolelinux.no/Dokumentasjon/ITIL/Samleside all in one page
-	http://developer.skolelinux.no/itil/moinmoin2pdf is useful for this 
+	- thats GFDL with invariant sections, ask Knut Yrvin <knuty at skolelinux.no>, Harald Thingelstad <harald at skolelinux.no>, Klaus Ade Johnstad <klaus.johnstad at holmlia.gs.oslo.no> to relicence without invariant sections
+	- or split into a -nonfree package 
 
-- fix debian/copyright
+- fix debian/copyright ("merge gfdl and gpl licences")
 
 - document in README.Debian:
 	- many translations not uptodate
 	- architecture document in en nb de nl pt_BR da
 	- IKT book in en nb de nl pt
 	- kurs and ITIL are norwegian only
+	- needs network to build (for svn access but also for itil)
 	
 - 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).