[debian-edu-commits] debian-edu/debian-edu-doc.git (#77) - wheezy (branch) updated: 0.4.20070715-6-g83ab2ca

Sat Oct 5 12:12:15 UTC 2013

The branch, wheezy has been updated
       via  83ab2ca724d145c759e02c603d28e32803f7cfc6 (commit)
      from  0011c211ab09b3366af5656d00699c5e357dfefa (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    |    3 +--
 debian/changelog |    8 ++++++++
 debian/copyright |   24 ++++++++++++------------
 debian/rules     |   13 ++-----------
 todo             |    7 ++-----
 5 files changed, 25 insertions(+), 30 deletions(-)

The diff of changes is:

diff --git a/debian/README b/debian/README
index d11692f..0dffd34 100644
--- a/debian/README
+++ b/debian/README
@@ -9,8 +9,7 @@ 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 ITIL documentation and the kursbook are currently disabled due to unclear 
-licence (ITIL) or nonfreeness according to DFSG (kursbook).
+The kursbook is currently disabled because it is GFDL with invarant sections.
 
 
 Translation status
diff --git a/debian/changelog b/debian/changelog
index b478179..429a400 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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.
+
+ -- Holger Levsen <holger at debian.org>  Sun, 15 Jul 2007 11:07:32 +0200
+
 debian-edu-doc (0.4.20070715) unstable; urgency=low
 
   [Holger Levsen]
diff --git a/debian/copyright b/debian/copyright
index c42ade7..ec1861d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -56,18 +56,6 @@ 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 
-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; 
-with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-
-A copy of the GNU Free Documentation License (Version 1.2) is
-included at the end of this file.
-
-----------------------------------------------------------------------------
-
 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),
@@ -93,6 +81,18 @@ 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 
+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; 
+with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+
+A copy of the GNU Free Documentation License (Version 1.2) is
+included at the end of this file.
+
+----------------------------------------------------------------------------
+
                   GNU Free Documentation License
                     Version 1.2, November 2002
 
diff --git a/debian/rules b/debian/rules
index 007a0ab..cf27973 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,7 @@ install: build
 	#	install -m 644 $(TMPSRC)/dokumentasjon/driftbok/netgroups.$$i.* $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
 	#	ln -s $(DESTPATH)/images/driftbook $(DESTDIR)$(DESTPATH)/$$i/driftbook/images ; \
 	#done
-	#
+	
 	# 
 	# IKT bok
 	#
@@ -91,15 +91,6 @@ install: build
 	#
 	# itil
 	#
-	# disabled again - holger 2007-07-14
-	#
-	# before enabling it again: please update ./debian/copyright first, then update ./todo
-	# then enable it. Thanks.
-	#
-	# enabled again - knuty 2007-07-15
-	#
-	# after updating ./debian/copyright and then ./todo
-	#
 	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
 
@@ -122,7 +113,7 @@ install: build
 	#install -d $(DESTDIR)$(DESTPATH)/no/kurs/bilder
 	#install -m 644 $(SRCDIR)/norwegian/kurs/bilder/* \
 	#	$(DESTDIR)$(DESTPATH)/no/kurs/bilder
-	#
+	
 	#
 	# cleanup
 	#
diff --git a/todo b/todo
index cda7670..fb8773a 100644
--- a/todo
+++ b/todo
@@ -14,10 +14,12 @@ so the plan for the docs on svn.d.n is:
 		  suggests get-orig-source
 	- document how to use those targets (in debian/README)
 	- do we really want to ship .txt files too? (just because we can...)
+
 - release-manual
 	- links in html version are broken
 	- multi-page html version missing
 	- $DEBIAN_EDU_DOC_BUILDDATE is not replaced with actual build date
+
 - architecture documents
 	- make after svn co doesnt work
 	- broken umlauts in de and pt_BR
@@ -34,11 +36,6 @@ so the plan for the docs on svn.d.n is:
 	- html versions incomplete (and therefore not copied at all)
 
 - itil
-        - http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne got GPL v2 license
-        - The copyright statement are included at the wiki-page. [knuty 2007-07-15]
-	- debian/copyright is updated to reflect this
-	- please modify debian/rules to include itil [knuty ask holger to do that]
-          http://wiki.skolelinux.no/Dokumentasjon/ITIL/Innledning is written in Norwegian
 	- include moinmoin2pdf in this package instead of downloading it
 
 - documentation/norwegian/kurs


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


