[debian-edu-commits] debian-edu/debian-edu-doc.git (#95) - wheezy (branch) updated: 0.5.20070716-4-g436e195

[David Prévot]

The branch, wheezy has been updated
       via  436e1957ed47b9fe3c77f60f466f6700fdd9bcb0 (commit)
      from  53aad3257a7e71e9371cd67781f40a8bf448e520 (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/copyright |   24 ++++++++++++++++++++++++
 debian/rules     |   16 ++++++++--------
 todo             |   18 +++++++-----------
 3 files changed, 39 insertions(+), 19 deletions(-)

The diff of changes is:
diff --git a/debian/copyright b/debian/copyright
index aaf0749..44cbcc0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -89,6 +89,30 @@ 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.
+
+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
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+On Debian systems, the complete text of the GNU General Public License can be
+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
diff --git a/debian/rules b/debian/rules
index cafc5aa..6626e00 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,14 +86,14 @@ install: build
 	#
 	# disabled due to GFDL with invariant sections
 	#
-	#install -d $(DESTDIR)$(DESTPATH)/no/kurs
-	#install -m 644 $(SRCDIR)/norwegian/kurs/kursdok* $(DESTDIR)$(DESTPATH)/no/kurs
-	#install -d $(DESTDIR)$(DESTPATH)/no/kurs/figurer
-	#install -m 644 $(SRCDIR)/norwegian/kurs/figurer/* \
-	#	$(DESTDIR)$(DESTPATH)/no/kurs/figurer
-	#install -d $(DESTDIR)$(DESTPATH)/no/kurs/bilder
-	#install -m 644 $(SRCDIR)/norwegian/kurs/bilder/* \
-	#	$(DESTDIR)$(DESTPATH)/no/kurs/bilder
+	install -d $(DESTDIR)$(DESTPATH)/nb/kursdok
+	install -m 644 $(SRCDIR)/norwegian/kurs/kursdok* $(DESTDIR)$(DESTPATH)/nb/kursdok
+	install -d $(DESTDIR)$(DESTPATH)/nb/kursdok/figurer
+	install -m 644 $(SRCDIR)/norwegian/kurs/figurer/* \
+		$(DESTDIR)$(DESTPATH)/nb/kursdok/figurer
+	install -d $(DESTDIR)$(DESTPATH)/nb/kursdok/bilder
+	install -m 644 $(SRCDIR)/norwegian/kurs/bilder/* \
+		$(DESTDIR)$(DESTPATH)/nb/kursdok/bilder
 	
 	#
 	# cleanup
diff --git a/todo b/todo
index 20a3dde..dd12588 100644
--- a/todo
+++ b/todo
@@ -37,21 +37,17 @@ so the plan for the docs on svn.d.n is:
 	- document in debian/copyright where it was downloaded from
 
 - 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 (rather not)
 	- document in debian/copyright where it was downloaded from
-
-- remove this file :)
-
+	- thats a good question though :-/
+	- document the change to GPL in the source files and the 
+	  generated document (the one we ship and currently cannot 
+	  genereate...), see the thread started with 
+	  <200707170200.12642.holger at layer-acht.org> on 
+	  debian-edu at lists.debian.org
 
 
+- remove this file :)
 
 
-copyright snipplets for kursbook:
----------------------------------
 
-The files in documentation/norwegian/kurs are written and copyrighted 2003 
-by Knut Yrvin (knuty at skolelinux.no), Harald Thingelstad (harald at skolelinux.no)
-and Klaus Ade Johnstad (klaus.johnstad at holmlia.gs.oslo.no) and are licenced 
-under licensed under the GFDL - currently with invariant sections :(
 


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