[debian-edu-commits] debian-edu/debian-edu-doc.git (#58) - wheezy (branch) updated: 0.4.20070714-3-g68334df

Sat Oct 5 12:11:57 UTC 2013

The branch, wheezy has been updated
       via  68334df053ee239a18c799a72d92fc328a46f9f3 (commit)
      from  eb9a2b860f20c06ee64c2d62a12c749216ed62df (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 |   12 +++++++++---
 debian/rules     |   11 +++++++----
 todo             |   28 +++++-----------------------
 3 files changed, 21 insertions(+), 30 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 6038654..1edcb5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-edu-doc (0.4.20070715) unstable; urgency=low
+
+  [Holger Levsen]
+  * cleaned up todo
+  * disable ITIL document again, as debian/copyright doesnt cover it
+
+ -- Holger Levsen <holger at debian.org>  Sat, 14 Jul 2007 23:35:47 +0200
+
 debian-edu-doc (0.4.20070714) unstable; urgency=low
 
   * Avoid removing the documentation/ directory during build, and
@@ -29,10 +37,8 @@ debian-edu-doc (0.4.20070706) unstable; urgency=low
 
   * include new documentation from http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/
   * added build-depends to po4a to provide translation infrastructure for it
-  * todo: currently only pdf generation works, html version needs some work
-  * todo: the wikibook is not yet part of the binary package 
 
- -- Holger Levsen <holger at debian.org>  Fri,  6 Jul 2007 15:43:54 +0200
+ -- Holger Levsen <holger at debian.org>  Thu, 12 Jul 2007 15:20:30 +0200
 
 debian-edu-doc (0.3.20070517) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 9ab89b6..b15bb15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,7 @@ SRCDIR  = documentation
 DESTPATH = /usr/share/doc/debian-edu-doc
 REVISION= "{2007-05-17}"
 TMPSRC:=$(CURDIR)/documentation/tmp
-#TMPSRC:=$(shell mktemp -d)
 
-#SVNBASE=svn+ssh://svn.skolelinux.org/repos/skolelinux/trunk
 SVNBASE=svn://svn.skolelinux.org/skolelinux/trunk
 
 update:
@@ -80,8 +78,13 @@ install: build
 	#
 	# itil
 	#
-	install -d $(DESTDIR)$(DESTPATH)/nb/itil
-	$(TMPSRC)/moinmoin2pdf http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne  $(DESTDIR)$(DESTPATH)/nb/itil/itil-$$(date +%Y-%m-%d).pdf
+	# disabled again - holger 2007-07-14
+	#
+	# before enabling it again: please update ./debian/copyright first, then update ./todo
+	# then enable it. Thanks.
+	#
+	#install -d $(DESTDIR)$(DESTPATH)/nb/itil
+	#$(TMPSRC)/moinmoin2pdf http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne  $(DESTDIR)$(DESTPATH)/nb/itil/itil-$$(date +%Y-%m-%d).pdf
 
 	#
 	# release manual
diff --git a/todo b/todo
index ba30d38..17a5a96 100644
--- a/todo
+++ b/todo
@@ -13,21 +13,12 @@ so the plan for the docs on svn.d.n is:
 - 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/AllInOne have?
+- itil
+        - what licence does http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne have?
           maybe the same as wiki.s.no? :) ask akai or knut
-          - It is GPL, and the wiki page is updated to reflect this. [pere 2007-07-12]
-		<finnarne> pere: someone needs to check the document that the ITIL book is copied from. 
-		<finnarne> Most of it is copied from other documentation. 
-		<h01ger> finnarne, morning - which other book?
-		<h01ger> "morning" white :)
-		<finnarne> newdriftbook among others. 
-		<finnarne> and from wiki.debian.org
-		<pere> finnarne: at least if the source wasn't gpl-licensed.
-		<finnarne> pere: I have a feeling that most of the information in the ITIL book is cut and paste from various sources, and that the "author" hasn't thought about copyright and license at all. But maybe i'm not objective in the matter. 
-		<pere> finnarne: perhaps.  can you add a section at the end of the wiki document with references you believed were used, and a commend that some of the text is copied from there?
-		<finnarne> I'll try to find the time, but that should have been done by the "author(s)"
-		<pere> it would be great if the references included URLs to the source document too.
+        - It is GPL, and the wiki page is updated to reflect this. [pere 2007-07-12]
+	- then please update debian/copyright to reflect this first, before you ship it (that is, modify debian/rules again to include it)
+		http://wiki.skolelinux.no/Dokumentasjon/ITIL/Innledning is written in a language I cannot understand, so I cannot do it.
 - documentation/norwegian/kurs
 	- 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 
@@ -40,15 +31,6 @@ so the plan for the docs on svn.d.n is:
 
 
 
-"random stuff", we need to make sure is mentioned in the newdriftbooketch
----------------
-- add/check info on the following things in newdriftbook:
-	- create users
-	- access homes
-	- thin-clients
-	- lwat
-	- cipux
-	- italc
 
 
 copyright snipplets for itil and kursbook:


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


