[debian-edu-commits] debian-edu/debian-edu-doc.git (#39) - wheezy (branch) updated: f8af51db2200177d9fb05a1cf6fdd74d10310621

[David Prévot]

The branch, wheezy has been updated
       via  f8af51db2200177d9fb05a1cf6fdd74d10310621 (commit)
      from  5fd4e3458e6d34f33458375838696a5f63310fb0 (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/rules     |   12 +++++-------
 todo             |    4 +++-
 3 files changed, 10 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 45b8ac5..b6c0684 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ debian-edu-doc (0.4.20070707) UNRELEASED; urgency=low
 
   [ Petter Reinholdtsen ]
   * Update URL to use for the Norwegian ITIL sysadmin book.
+  * Enable building of the ITIL sysadmin book, as the license
+    issue is resolved, and the license is GPL.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 12 Jul 2007 12:09:24 +0200
 
diff --git a/debian/rules b/debian/rules
index aa24dbc..c3eb9bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,13 +60,11 @@ install: build
 	#
 	# itil
 	#
-	#
-	# disabled due to unclear licence
-	#
-	#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/AllInOne  $(DESTDIR)$(DESTPATH)/no/itil/itil-$$(date +%Y-%m-%d).pdf
+	install -d $(DESTDIR)$(DESTPATH)/nb/itil
+	wget http://developer.skolelinux.no/itil/moinmoin2pdf -O $(TMPSRC)/moinmoin2pdf
+	chmod +x $(TMPSRC)/moinmoin2pdf
+	$(TMPSRC)/moinmoin2pdf http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne  $(DESTDIR)$(DESTPATH)/nb/itil/itil-$$(date +%Y-%m-%d).pdf
+
 	#
 	# kurs 
 	#
diff --git a/todo b/todo
index c0d06b0..ba30d38 100644
--- a/todo
+++ b/todo
@@ -14,7 +14,9 @@ so the plan for the docs on svn.d.n is:
 	- 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? maybe the same as wiki.s.no? :) ask akai or knut
+	- 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?


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