[debian-edu-commits] debian-edu/debian-edu-doc.git (#61) - wheezy (branch) updated: 0.4.20070714-6-g0880aad

[David Prévot]

The branch, wheezy has been updated
       via  0880aadddd3faae4c86556a728934e5e8d182347 (commit)
      from  2c70feeae465c0215c252a8058fa7a1790c1c487 (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 |   16 +++++++++++++---
 debian/rules  |   23 +++++++++++++++--------
 todo          |   14 ++++++++------
 3 files changed, 36 insertions(+), 17 deletions(-)

The diff of changes is:
diff --git a/debian/README b/debian/README
index 52a4d6e..d11692f 100644
--- a/debian/README
+++ b/debian/README
@@ -1,7 +1,9 @@
 Status
 ------
+http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/ is our new (and still 
+incomplete) documentation for Debian-edu etch. 
 
-Many documents are outdated, explaining sarge. The driftbook is even older. 
+Many of the other documents are outdated, explaining sarge. 
 
 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-
@@ -29,8 +31,16 @@ 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.
+See and contribute to http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/ 
+and http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/Translations and 
+./documentation/release-manual/README
 
 
+Building this package
+---------------------
 
--- Holger Levsen, holger at debian.org, 2007-05-14
+Only works when you have network :)
+
+
+
+-- Holger Levsen, holger at debian.org, 2007-07-15
diff --git a/debian/rules b/debian/rules
index 2d8229a..8e67cce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ SVNBASE=svn://svn.skolelinux.org/skolelinux/trunk
 update:
 	svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/arkitektur $(TMPSRC)/arkitektur
 	svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon $(TMPSRC)/dokumentasjon
+	# this script is so short, that I believe it should be part of this package and not downloaded during build time
 	wget http://developer.skolelinux.no/itil/moinmoin2pdf -O $(TMPSRC)/moinmoin2pdf
 	chmod +x $(TMPSRC)/moinmoin2pdf
 
@@ -52,14 +53,20 @@ install: build
 	# 
 	# drift
 	#
-	install -d $(DESTDIR)$(DESTPATH)/images/driftbook/ ; 
-	install -m 644 $(TMPSRC)/dokumentasjon/driftbok/images/* $(DESTDIR)$(DESTPATH)/images/driftbook ; 
-	for i in en nb de pt_BR ; do \
-		install -d $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
-		install -m 644 $(TMPSRC)/dokumentasjon/driftbok/driftbok.$$i.* $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
-		install -m 644 $(TMPSRC)/dokumentasjon/driftbok/netgroups.$$i.* $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
-		ln -s $(DESTPATH)/images/driftbook $(DESTDIR)$(DESTPATH)/$$i/driftbook/images ; \
-	done
+	# disabled: 	this is the driftbook for the _woody_-version and IMO quite 
+	# 		useless to ship.
+	# 		we _might_ want to still ship the newdriftbook (which is for
+	# 		sarge) - but I'm not even really sure about this
+	# 		
+	#
+	#install -d $(DESTDIR)$(DESTPATH)/images/driftbook/ ; 
+	#install -m 644 $(TMPSRC)/dokumentasjon/driftbok/images/* $(DESTDIR)$(DESTPATH)/images/driftbook ; 
+	#for i in en nb de pt_BR ; do \
+	#	install -d $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
+	#	install -m 644 $(TMPSRC)/dokumentasjon/driftbok/driftbok.$$i.* $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
+	#	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
 	#
diff --git a/todo b/todo
index 17a5a96..8716280 100644
--- a/todo
+++ b/todo
@@ -2,14 +2,18 @@ todo
 ----
 so the plan for the docs on svn.d.n is:
 - for now checkout during build from there, 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
+- this has been discussed and agreed as a good plan at the developer gathering in June 2007 in Trondheim (mostly between Holger and Klaus, who argued that there are no documentation writers (anymore) except him)
+
 
 - architecture documents
-	- make after svn co doesnt work yet
-	- broken umlauts in de and pt_BR
+	- is this still the case?:
+		- make after svn co doesnt work yet
+		- broken umlauts in de and pt_BR
+	- I think we should copy the contents to http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/Architecture and in future ship this version
 - newdriftbook
 	- currently its the driftbook, not the newdriftbook
-	- still the sarge version, start a new copy for etch
-	- make after svn co doesnt work yet
+	- do we want to ship the newdriftbook anyway?
+	- is this still the case?: make after svn co doesnt work yet
 - ikt book
 	- make after svn co doesnt work yet
 	- html versions incomplete (and therefore not copied at all)
@@ -24,8 +28,6 @@ so the plan for the docs on svn.d.n is:
 	- or split into a -nonfree package 
 
 
-- document in README.Debian:
-	- needs network to build (for svn access but also for itil)
 	
 - remove this file :)
 


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