[debian-edu-commits] debian-edu/debian-edu-doc.git (#207) - wheezy (branch) updated: 0.6.20071024-10-g491bf55

Sat Oct 5 12:14:12 UTC 2013

The branch, wheezy has been updated
       via  491bf557fa0888509ecede9d17ce3a23384dea44 (commit)
      from  c7b43cc8d93c28860a8a5eb8a78cbcce56754bf1 (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/control   |    2 +-
 debian/rules     |   16 +++++++++-------
 todo             |    2 ++
 4 files changed, 16 insertions(+), 11 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index d682078..0c86571 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +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 
+  * build ikt book from source. For the norwegian version also ship the
+    bugrap_howto, ldap_admin and Rammekrav
+  * added tth and lyx to Build-Depends-Indep to be able to build the ikt book
 
- -- Holger Levsen <holger at debian.org>  Fri, 26 Oct 2007 15:47:25 +0200
+ -- Holger Levsen <holger at debian.org>  Fri, 26 Oct 2007 16:24:10 +0200
 
 debian-edu-doc (0.7.20071025) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7ea35f5..c31b1ef 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debian-edu-doc
 Section: doc
 Priority: optional
 Build-Depends: debhelper (>= 5) 
-Build-Depends-Indep: docbook-utils, poxml, ldp-docbook-xsl, dblatex, po4a, dia | dia-gnome, imagemagick
+Build-Depends-Indep: docbook-utils, poxml, ldp-docbook-xsl, dblatex, po4a, dia | dia-gnome, imagemagick, tth, lyx
 Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
 Uploaders: Petter Reinholdtsen <pere at debian.org>, Morten Werner Olsen <werner at debian.org>, Steffen Joeris <white at debian.org>, Holger Levsen <holger at debian.org>
 Standards-Version: 3.7.2
diff --git a/debian/rules b/debian/rules
index 993d7f2..cd1b66a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,19 +8,20 @@ REVISION = "{2007-10-24}"
 SVNBASE=svn://svn.skolelinux.org/skolelinux/trunk
 
 get-orig-source:
+	# checkout architecture document
 	[ -d $(SRCDIR)/arkitektur/.svn ] || svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/arkitektur $(SRCDIR)/arkitektur 
 	svn up -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/arkitektur $(SRCDIR)/arkitektur 
+	# checkout kurs book
 	[ -d $(SRCDIR)/kurs/.svn ] || svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/kurs $(SRCDIR)/kurs
 	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
-	# 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 \{\} \;
+	# checkout IKT book and related files
 	[ -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 itil document
 	GET "http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne?action=format&mimetype=xml/docbook"   | sed "s%</%\n</%g" > $(SRCDIR)/norwegian/itil.xml
+	# update release-manual
 	$(MAKE) -C documentation/release-manual update
 	# clean sources
 	find $(SRCDIR) -name "*.eps" -exec rm \{\} \;
@@ -67,14 +68,15 @@ install: build
 	# 
 	# IKT bok
 	#
-	cd $(SRCDIR)/ikt && make all
+	cd $(SRCDIR)/ikt && make all IKT-bok.html IKT-bok.pdf 
 	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 ; \
+		install -m 644 $(SRCDIR)/ikt/IKT-bok.$$i.html $(DESTDIR)$(DESTPATH)/$$i/ikt/IKT-bok.html ; \
+		install -m 644 $(SRCDIR)/ikt/IKT-bok.$$i.pdf $(DESTDIR)$(DESTPATH)/$$i/ikt/IKT-bok.pdf ; \
 	done
 	# The nb version is without language tag
 	install -d $(DESTDIR)$(DESTPATH)/nb/ikt
-	for end in html pdf txt ; do \
+	for end in html pdf ; 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 ; \
diff --git a/todo b/todo
index ac05c57..5b90d65 100644
--- a/todo
+++ b/todo
@@ -14,6 +14,8 @@ This should be fixed for r1:
 	- 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
+	- encoding broken in html versions
 
 
 This will not be fixed for r1, but should be fixed for r2/lenny:


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


