[debian-edu-commits] debian-edu/debian-edu-doc.git (#205) - wheezy (branch) updated: 0.6.20071024-8-g5ccfabf

[David Prévot]

The branch, wheezy has been updated
       via  5ccfabf2732a6b5d60cb38db738e3f3196e3671e (commit)
      from  2df29211ddce4eebe48474cfe1671f3f3911a0c7 (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 |    7 +++++++
 debian/rules     |   18 ++++++++++--------
 todo             |   15 ++++++++-------
 3 files changed, 25 insertions(+), 15 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3acb10b..d682078 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-edu-doc (0.7.20071026) unstable; urgency=low
+
+  * build ikt book from source. For the norwegian version also ship the 
+    bugrap_howto, ldap_admin and Rammekrav 
+
+ -- Holger Levsen <holger at debian.org>  Fri, 26 Oct 2007 15:47:25 +0200
+
 debian-edu-doc (0.7.20071025) unstable; urgency=low
 
   * release-manual.pdf: specify max-size for images, so two fit on one page in the pdf
diff --git a/debian/rules b/debian/rules
index b074693..993d7f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,12 +14,12 @@ get-orig-source:
 	svn up -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/kurs $(SRCDIR)/kurs
 	# FIXME: delete this in svn...
 	rm $(SRCDIR)/kurs/appsBilder/ $(SRCDIR)/kurs/dosSkjermBilder/ $(SRCDIR)/kurs/kde/ $(SRCDIR)/kurs/webmin/ $(SRCDIR)/kurs/wineSkjermBilder/ -Rf
-	# FIXME: checking everything out and then deleting 98% is not the best approach
-	# 	 a better strategy would be to only check out the needed IKT* files and 
-	# 	 the Makefile and then run make. Laters :)
-	[ -d $(SRCDIR)/ikt/.svn ] || svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon $(SRCDIR)/ikt
-	svn up -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon $(SRCDIR)/ikt
-	-find $(SRCDIR)/ikt ! -name ikt ! -name "IKT*" ! -name Makefile ! -regex $(SRCDIR)/ikt/.svn.* -exec rm -Rf \{\} \;
+	# checkout IKT bok and related files
+	#[ -d $(SRCDIR)/ikt/.svn ] || svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon $(SRCDIR)/ikt
+	#svn up -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon $(SRCDIR)/ikt
+	#-find $(SRCDIR)/ikt ! -name ikt ! -name "IKT*" ! -name Makefile ! -name Makefile.lyx ! -name Makefile.latex ! -name bugrap_howto.lyx ! -name ldap_admin.lyx ! -name Rammekrav.lyx ! -regex $(SRCDIR)/ikt/.svn.* -exec rm -Rf \{\} \;
+	[ -d $(SRCDIR)/ikt/.svn ] || svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon/ikt $(SRCDIR)/ikt
+	svn up -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon/ikt $(SRCDIR)/ikt
 	GET "http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne?action=format&mimetype=xml/docbook"   | sed "s%</%\n</%g" > $(SRCDIR)/norwegian/itil.xml
 	$(MAKE) -C documentation/release-manual update
 	# clean sources
@@ -67,16 +67,18 @@ install: build
 	# 
 	# IKT bok
 	#
+	cd $(SRCDIR)/ikt && make all
 	for i in en de nl ; do \
 		install -d $(DESTDIR)$(DESTPATH)/$$i/ikt ; \
 		install -m 644 $(SRCDIR)/ikt/IKT-bok.$$i.* $(DESTDIR)$(DESTPATH)/$$i/ikt ; \
 	done
-		#missing in the for loop above:
-		#install -m 644 $(SRCDIR)/ikt/IKT-bok.html.$$i $(DESTDIR)$(DESTPATH)/$$i/ikt ; \
 	# The nb version is without language tag
 	install -d $(DESTDIR)$(DESTPATH)/nb/ikt
 	for end in html pdf txt ; do \
 		install -m 644 $(SRCDIR)/ikt/IKT-bok.$$end $(DESTDIR)$(DESTPATH)/nb/ikt ; \
+		install -m 644 $(SRCDIR)/ikt/Rammekrav.$$end $(DESTDIR)$(DESTPATH)/nb/ikt ; \
+		install -m 644 $(SRCDIR)/ikt/bugrap_howto.$$end $(DESTDIR)$(DESTPATH)/nb/ikt ; \
+		install -m 644 $(SRCDIR)/ikt/ldap_admin.$$end $(DESTDIR)$(DESTPATH)/nb/ikt ; \
 	done
 
 	#
diff --git a/todo b/todo
index d30ba89..3078887 100644
--- a/todo
+++ b/todo
@@ -1,8 +1,7 @@
 todo
 ----
 
-It would be nice to release r1 without this file :)
-
+This should be fixed for r1:
 
 - itil
 	- also build html version
@@ -15,6 +14,13 @@ It would be nice to release r1 without this file :)
 	- should we assign the copyright of the document and its translation to the skolelinux
 	  foundation or whatever legal body we have, or to SPI or to the FSF?
 
+- ikt book
+	- make after svn co doesnt work yet: html versions incomplete (check if the latter is still true)
+		- would be very useful indeed, cause the current document has very broken html at the beginning
+	- fix debian/rules (see FIXME there)
+
+This will not be fixed for r1, but should be fixed for r2/lenny:
+
 - architecture document
 	- has been moved to http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/Architecture
 		but the "svn-version" should stay in the package until the translations are 
@@ -24,13 +30,8 @@ It would be nice to release r1 without this file :)
 	  into the image. That looks easy: .dia files are just compressed xml 
 	  files, so we just need to sed the strings in there :)
 
-- ikt book
-	- make after svn co doesnt work yet: html versions incomplete (check if the latter is still true)
-		- would be very useful indeed, cause the current document has very broken html at the beginning
-	- fix debian/rules (see FIXME there)
 
 - other docs:
 	- svn://svn.skolelinux.org/repos/skolelinux/trunk/www/developer.skolelinux.no/artikler/skolelinux-do-ocracy.txt might also be interesting
 
-
 - 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).