[debian-edu-commits] debian-edu/debian-edu-doc.git (#25) - wheezy (branch) updated: 5e9c8d765f5e6d65356bba7f32d191ecb7a46568

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

The branch, wheezy has been updated
       via  5e9c8d765f5e6d65356bba7f32d191ecb7a46568 (commit)
      from  f99b3b3f4e3c2ce467320d72c4c0ae7dfe78abf8 (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 |    6 +++++-
 debian/control   |    2 +-
 debian/copyright |    5 +----
 debian/rules     |   38 +++++++++++++++++++++++++++++---------
 todo             |   29 ++++++++++++-----------------
 5 files changed, 48 insertions(+), 32 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 300473b..197d167 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,8 +26,12 @@ debian-edu-doc (0.2) unstable; urgency=low
     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
+  * added build-depends to build those documents
+  * english directory names (Closes: Skolelinux bug #1029)
 
- -- Holger Levsen <holger at debian.org>  Sun, 13 May 2007 17:20:03 +0200
+ -- Holger Levsen <holger at debian.org>  Sun, 13 May 2007 23:54:59 +0200
 
 debian-edu-doc (0.1-4+svn46790) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8ab0151..28a2f8a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: debian-edu-doc
 Section: doc
 Priority: optional
-Build-Depends: debhelper (>= 5), poxml
+Build-Depends: debhelper (>= 5), poxml, ldp-docbook-xsl
 Build-Depends-Indep: docbook-utils
 Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
 Uploaders: Petter Reinholdtsen <pere at debian.org>, Morten Werner Olsen <werner at debian.org>, Luk Claes <luk at debian.org>, Steffen Joeris <white at debian.org>, Holger Levsen <holger at debian.org>
diff --git a/debian/copyright b/debian/copyright
index 369ce76..d4d760c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,14 +4,12 @@ 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
 
 [licence text/pointer here]
 
-
-The files in documentation/ikt-book/ are Copyright 2002, 2003 Vibeke Braaten, 
+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 
@@ -20,7 +18,6 @@ Back-Cover Texts.
 
 [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 
diff --git a/debian/rules b/debian/rules
index 8014344..d60c2b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 DESTDIR = debian/debian-edu-doc
 SRCDIR  = documentation
 DESTPATH = /usr/share/doc/debian-edu-doc
+REVISION= "{2007-05-13}"
+TMPSRC:=$(shell mktemp -d)
 
 clean:
 	rm -f build-stamp
@@ -25,17 +27,29 @@ install: build
 	dh_installdirs
 	install -d $(DESTDIR)$(DESTPATH)
 
-# arkitektur
-	svn co svn://svn.skolelinux.org/skolelinux/trunk/www/developer.skolelinux.no/arkitektur $(DESTDIR)$(DESTPATH)/arkitektur
-	find $(DESTDIR)$(DESTPATH)/arkitektur -name *.po -exec rm \{\} \;
+	# 
+	# 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 $(DESTDIR)$(DESTPATH)/arkitektur/*.$$i.* $(DESTDIR)$(DESTPATH)/$$i/architecture ; \
-		install -m 644 $(DESTDIR)$(DESTPATH)/arkitektur/*_$$i.* $(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
-	rm $(DESTDIR)$(DESTPATH)/arkitektur -r
-
+	# 
+	# IKT bok
+	#
+	svn co -r $(REVISION) svn://svn.skolelinux.org/skolelinux/trunk/www/developer.skolelinux.no/dokumentasjon $(TMPSRC)/dokumentasjon
+	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
+#
 #	install -d $(DESTDIR)$(DESTPATH)/no/drift
 #	install -m 644 $(SRCDIR)/drift/*html $(DESTDIR)$(DESTPATH)/no/drift
 #	install -m 644 $(SRCDIR)/drift/driftbok.sgml \
@@ -49,8 +63,9 @@ install: build
 #		-o $(DESTDIR)$(DESTPATH)/no/drift
 #	-docbook2pdf  $(DESTDIR)$(DESTPATH)/drift/driftbok.sgml \
 #		-o $(DESTDIR)$(DESTPATH)/no/drift
-
-# kurs
+	#
+	# kurs (norwegian only atm)
+	#
 	install -d $(DESTDIR)$(DESTPATH)/no/kurs
 	install -m 644 $(SRCDIR)/norwegian/kurs/kursdok* $(DESTDIR)$(DESTPATH)/no/kurs
 	install -d $(DESTDIR)$(DESTPATH)/no/kurs/figurer
@@ -59,6 +74,11 @@ install: build
 	install -d $(DESTDIR)$(DESTPATH)/no/kurs/bilder
 	install -m 644 $(SRCDIR)/norwegian/kurs/bilder/* \
 		$(DESTDIR)$(DESTPATH)/no/kurs/bilder
+	#
+	# cleanup
+	#
+	rm $(TMPSRC) -Rf
+
 
 binary-indep: install
 	dh_testdir
diff --git a/todo b/todo
index 54512a0..0ffb2e8 100644
--- a/todo
+++ b/todo
@@ -6,27 +6,29 @@ so the plan for the docs on svn.d.n is:
 - turning the package version from 0.2 to 2007-05-11
 - in the longer term, discuss with the current doc writers to move the docs to alioth, so only one svn account is needed to work on debian-edu and the documentation
 
-
-
-- rename directory names to english (http://bugs.skolelinux.no/show_bug.cgi?id=1029)
-
 - architecture documents
-	- checkout using a date tag
 	- make after svn co doesnt work yet
+	- broken umlauts in de and pt_BR
+- ikt book
+	- make after svn co doesnt work yet
+	- html versions incomplete (and therefore not copied at all)
 
 - include newdriftbook, update it for etch
   from svn://svn.skolelinux.org/skolelinux/trunk/www/developer.skolelinux.no/dokumentasjon/newdriftbok
 
-- ikt-book in english missing
-	- from svn://svn.skolelinux.org/skolelinux/trunk/www/developer.skolelinux.no/dokumentasjon
-
 - documentation/norwegian/kurs: is that GFDL without invariant sections? this needs to be mentioned in debian/copyright
 
-- debian/rules
-	- install the ikt-book
+- ITIL book from wiki: http://wiki.skolelinux.no/Dokumentasjon/ITIL/Samleside all in one page
+	http://developer.skolelinux.no/itil/moinmoin2pdf is useful for this 
 
 - fix debian/copyright
 
+- document in README.Debian:
+	- many translations not uptodate
+	- architecture document in en nb de nl pt_BR da
+	- IKT book in en nb de nl pt
+	- kurs and ITIL are norwegian only
+	
 - remove this file :)
 
 
@@ -41,10 +43,3 @@ so the plan for the docs on svn.d.n is:
 	- cipux
 	- italc
 
-
-
-stuff we sh/could also include in this package
----------------
-http://wiki.skolelinux.no/Dokumentasjon/ITIL
-http://wiki.skolelinux.no/Dokumentasjon/ITIL/Samleside all in one page
-	http://developer.skolelinux.no/itil/moinmoin2pdf is useful for this 


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