[debian-edu-commits] debian-edu/debian-edu-doc.git (#31) - wheezy (branch) updated: 316abeb4bc0ab3f1ba63cd7481d0e5df7c01fa3d

David Prévot taffit at alioth.debian.org
Sat Oct 5 12:11:34 UTC 2013 

The branch, wheezy has been updated
       via  316abeb4bc0ab3f1ba63cd7481d0e5df7c01fa3d (commit)
      from  6b203bb9a6941ea5d5f64a63012cc2fc4cf1ffcc (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    |   36 +++++++++++++++++++++++++++++++
 debian/changelog |   38 +++++++++++++++++---------------
 debian/copyright |   33 ++++++++++++----------------
 debian/rules     |   63 ++++++++++++++++++++++++++++++------------------------
 todo             |   23 ++++++++++++++++++++
 5 files changed, 129 insertions(+), 64 deletions(-)
 create mode 100644 debian/README

The diff of changes is:
diff --git a/debian/README b/debian/README
new file mode 100644
index 0000000..d9e5c54
--- /dev/null
+++ b/debian/README
@@ -0,0 +1,36 @@
+Status
+------
+
+Many documents are outdated, explaining sarge. The driftbook is even older. 
+
+Also no document build 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).
+
+
+Translation status
+------------------
+
+The architecture document is developed in english and is translated into nb de
+nl pt_BR da.
+
+The newdriftbook is developed in english and is translated into no de pt_BR.
+
+The IKT book is developed in english and is translated into nb de nl pt.
+
+The ITIL documentation is developed in norsk and is not translated.
+
+The kursbook is developed in norsk and is not translated.
+
+
+How to get involved in documentation and translation
+----------------------------------------------------
+
+to be written. first these docs need to be fixed to build from source again.
+
+
+
+-- Holger Levsen, holger at debian.org, 2007-05-14
diff --git a/debian/changelog b/debian/changelog
index 2aa92cc..bea2dce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+debian-edu-doc (0.3.20070516) unstable; urgency=low
+
+  [ Holger Levsen ]
+  * Added myself to uploaders.
+  * Initial upload to Debian (Closes Skolelinux Bug #834)
+  * Updated description in debian/control
+  * removed the old driftbook and it's images
+  * removed the architecture document from source, it gets checked out from
+    its svn during build now
+  * put the names of the copyright holders into debian/copyright
+    (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)
+
+ -- Holger Levsen <holger at debian.org>  Wed, 16 May 2007 22:03:03 +0200
+
 debian-edu-doc (0.2) unstable; urgency=low
 
   [ Steffen Joeris ]
@@ -17,23 +37,7 @@ debian-edu-doc (0.2) unstable; urgency=low
   [ Luk Claes ]
   * Added myself to uploaders.
 
-  [ Holger Levsen ]
-  * Added myself to uploaders.
-  * Initial upload to Debian (Closes Skolelinux Bug #834)
-  * Updated description in debian/control
-  * removed the old driftbook and it's images
-  * removed the architecture document from source, it gets checked out from
-    its svn during build now
-  * put the names of the copyright holders into debian/copyright
-    (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)
-
- -- Holger Levsen <holger at debian.org>  Sun, 13 May 2007 23:54:59 +0200
+ -- Luk Claes <luk at debian.org>  Sun, 19 Nov 2006 16:55:31 +0100
 
 debian-edu-doc (0.1-4+svn46790) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index d61e761..1bbf43f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,30 +2,25 @@ This is the debian-edu-doc package.
 
 It was packaged by Mari Wang <mariwan at ifi.uio.no>, Steffen Jöris 
 (Steffen.Joeris at skolelinux.de), Frode Jemtland <frode.jemtland at skolelinux.no> 
-and Holger Levsen (holger at debian.org). The packaging is licenced under the GPL version2 or at your option, any later version. [licence text/pointer here]
- 
-The files in /usr/share/doc/debian-edu-doc/$lang/architecture/ are copyright 2002 by 
-Petter Reinholdtsen and are licenced under GPL
+and Holger Levsen (holger at debian.org). The packaging is licenced under the 
+GPL version2 or at your option, any later version. 
 
 [licence text/pointer here]
-
-The files in /usr/share/doc/debian-edu-doc/$lang/newdriftbook/ are Copyright YEAR FOO and others. 
+ 
+The files in /usr/share/doc/debian-edu-doc/$lang/architecture/ are 
+Copyright 2002 by Petter Reinholdtsen and are licenced under GPL
 
 [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 
-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.
+The files in /usr/share/doc/debian-edu-doc/$lang/newdriftbook/ are 
+Copyright YEAR FOO and others. (GPL)
 
-The files in /usr/share/doc/debian-edu-doc/$lang/itil/ are Copyright YEAR FOO and others. 
+[licence text/pointer here]
 
-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 - [hopefully with invariant sections, need to 
-be checked by someone who speaks norwegian]
+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.
 
-[licence text/pointer here]
diff --git a/debian/rules b/debian/rules
index bae0cd9..d9dadd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 DESTDIR = debian/debian-edu-doc
 SRCDIR  = documentation
 DESTPATH = /usr/share/doc/debian-edu-doc
-REVISION= "{2007-05-13}"
+REVISION= "{2007-05-16}"
 TMPSRC:=$(shell mktemp -d)
 
 clean:
@@ -31,55 +31,62 @@ install: build
 	# architecture document
 	#
 	svn co -r $(REVISION) svn://svn.skolelinux.org/skolelinux/trunk/www/developer.skolelinux.no/arkitektur $(TMPSRC)/arkitektur
-	find $(TMPSRC)/arkitektur -name *.po -exec rm \{\} \;
 	for i in en nb de nl pt_BR da ; do \
 		install -d $(DESTDIR)$(DESTPATH)/$$i/architecture ; \
 		install -m 644 $(TMPSRC)/arkitektur/*.$$i.* $(DESTDIR)$(DESTPATH)/$$i/architecture ; \
 		install -m 644 $(TMPSRC)/arkitektur/*_$$i.* $(DESTDIR)$(DESTPATH)/$$i/architecture ; \
 	done
 	# 
-	# IKT bok
+	# drift
 	#
 	svn co -r $(REVISION) svn://svn.skolelinux.org/skolelinux/trunk/www/developer.skolelinux.no/dokumentasjon $(TMPSRC)/dokumentasjon
+	for i in en no de pt_BR ; do \
+		install -d $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
+		install -m 644 $(TMPSRC)/dokumentasjon/driftbok/driftbook.$$i.* $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
+		install -m 644 $(TMPSRC)/dokumentasjon/driftbok/netgroups.$$i.* $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
+		install -d $(DESTDIR)$(DESTPATH)/$$i/driftbook/images ; \
+		install -m 644 $(TMPSRC)/dokumentasjon/driftbok/images/* $(DESTDIR)$(DESTPATH)/$$i/driftbook/images ; \
+	done
+	# 
+	# IKT bok
+	#
 	for i in en nb de nl pt ; do \
 		install -d $(DESTDIR)$(DESTPATH)/$$i/ikt-book ; \
 		install -m 644 $(TMPSRC)/dokumentasjon/IKT-bok.$$i.* $(DESTDIR)$(DESTPATH)/$$i/ikt-book ; \
 	done
 		#missing in the for loop above:
 		#install -m 644 $(TMPSRC)/dokumentasjon/IKT-bok.html.$$i $(DESTDIR)$(DESTPATH)/$$i/ikt-book ; \
-	# 
-	# drift
-	#
-	for i in en no de pt_BR ; do \
-		install -d $(DESTDIR)$(DESTPATH)/$$i/newdriftbook ; \
-		install -m 644 $(TMPSRC)/dokumentasjon/newdriftbok/driftbook.$$i.* $(DESTDIR)$(DESTPATH)/$$i/newdriftbook ; \
-		install -m 644 $(TMPSRC)/dokumentasjon/newdriftbok/netgroups.$$i.* $(DESTDIR)$(DESTPATH)/$$i/newdriftbook ; \
-		install -d $(DESTDIR)$(DESTPATH)/$$i/newdriftbook/images ; \
-		install -m 644 $(TMPSRC)/dokumentasjon/newdriftbok/images/* $(DESTDIR)$(DESTPATH)/$$i/newdriftbook/images ; \
-	done
 	#
 	# 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
+	#
+	# 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/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
-	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
+	#
+	# 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
 	#
 	# cleanup
 	#
-	rm $(TMPSRC) -Rf
-
+	#rm $(TMPSRC) -Rf
+	find $(DESTDIR)$(DESTPATH) -name "*.po" -exec rm \{\} \;
+	find $(DESTDIR)$(DESTPATH) -name "*.sgml" -exec rm \{\} \;
+	find $(DESTDIR)$(DESTPATH) -name "*.eps" -exec rm \{\} \;
 
 binary-indep: install
 	dh_testdir
@@ -87,7 +94,7 @@ binary-indep: install
 	dh_installdocs
 	dh_installchangelogs
 	dh_link
-#	dh_compress
+	dh_compress 
 	dh_fixperms
 	dh_installdeb
 	dh_gencontrol
diff --git a/todo b/todo
index 2efda2a..99ccd88 100644
--- a/todo
+++ b/todo
@@ -1,5 +1,14 @@
 todo
 ----
+- debian/changelog: release 0.3.20070516 and 0.2
+- debian/rules: comment problematic stuff out
+- debian/README.Debian newly written
+- debian/copyright, finish
+- check produced deb (for unwanted files)
+- linda & lintian "clean" (existing warnings are correct)
+- upload
+
+
 so the plan for the docs on svn.d.n is:
 - for now checkout during build from there
 - by using a tag, possible a date tag
@@ -57,3 +66,17 @@ so the plan for the docs on svn.d.n is:
 	- cipux
 	- italc
 
+
+copyright snipplets for itil and kursbook:
+------------------------------------------
+
+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)
+and Klaus Ade Johnstad (klaus.johnstad at holmlia.gs.oslo.no) and are licenced 
+under licensed under the GFDL - [hopefully with invariant sections, need to 
+be checked by someone who speaks norwegian]
+
+[licence text/pointer here]


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

More information about the debian-edu-commits mailing list