[debian-edu-commits] debian-edu/debian-edu-doc.git (#287) - wheezy (branch) updated: 0.8.20071115-6-g71abf21

[David Prévot]

The branch, wheezy has been updated
       via  71abf21d7833a433d0ff1f840361d315b96e4a65 (commit)
      from  021c3912f59a586d2fdc0ad70c50e9d36c493ac0 (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:
 Makefile                              |    8 +++++---
 debian/changelog                      |    7 +++++++
 documentation/release-manual/Makefile |   11 +++++------
 todo                                  |    9 ++++-----
 4 files changed, 21 insertions(+), 14 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 13d3624..7b42372 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ SRCDIR  := $(CURDIR)/documentation
 DESTDIR =
 DESTPATH = /usr/share/doc/debian-edu-doc
 
-all: $(SRCDIR)/norwegian/itil.pdf
+all: build
 #
 # Build release manual
 #
@@ -15,17 +15,19 @@ get-orig-source:
 # get itil document
 	GET "http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne?action=format&mimetype=xml/docbook"   | sed "s%</%\n</%g" > $(SRCDIR)/norwegian/itil.xml
 
-$(SRCDIR)/norwegian/itil.pdf: $(SRCDIR)/norwegian/itil.xml
+build:
 #
 # Build ITIL book
 #
 	dblatex -T simple -o $(SRCDIR)/norwegian/itil.pdf $(SRCDIR)/norwegian/itil.xml
+	-openjade -t sgml -i html -E 10000 -d /usr/share/docbook-utils/docbook-utils.dsl\#html -V paper-type=A4 -V nochunks /usr/share/sgml/declaration/xml.dcl $(SRCDIR)/norwegian/itil.xml > $(SRCDIR)/norwegian/itil.html
+
 install:
 #
 # Install ITIL book
 #
 	install -d $(DESTDIR)$(DESTPATH)/nb/itil
-	install -m 644 $(SRCDIR)/norwegian/itil.pdf $(DESTDIR)$(DESTPATH)/nb/itil 
+	install -m 644 $(SRCDIR)/norwegian/itil.pdf $(SRCDIR)/norwegian/itil.html $(DESTDIR)$(DESTPATH)/nb/itil 
 
 #
 # Install release manual
diff --git a/debian/changelog b/debian/changelog
index ed3d55d..6f49bf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-edu-doc (0.8.20071117) unstable; urgency=low
+
+  * build html version of itil book
+  * link to release manual in all languages
+
+ -- Holger Levsen <holger at debian.org>  Sat, 17 Nov 2007 23:56:59 +0100
+
 debian-edu-doc (0.8.20071115) unstable; urgency=low
 
   [ Petter Reinholdtsen ]
diff --git a/documentation/release-manual/Makefile b/documentation/release-manual/Makefile
index b0cb7c5..a8eb98e 100644
--- a/documentation/release-manual/Makefile
+++ b/documentation/release-manual/Makefile
@@ -1,7 +1,6 @@
 DESTDIR=
 DESTPATH = /usr/share/doc/debian-edu-doc
-# better: define LANGUAGES based on the existing .po files
-LANGUAGES=es nb de 
+LANGUAGES = `find . -name "release-manual.*.po" | sed -e "s/.\/release-manual.//" -e "s/.po//"`
 
 all: build
 build:
@@ -17,7 +16,7 @@ build:
 	# Ignore errors because the docbook xml is broken
 	#
 	# build the other html versions
-	-for f in $(LANGUAGES) ; do \
+	-for f in $LANGUAGES ; do \
 		openjade -t sgml -i html -E 1000 -d /usr/share/docbook-utils/docbook-utils.dsl\#html -V paper-type=A4 -V nochunks /usr/share/sgml/declaration/xml.dcl release-manual.$$f.xml > release-manual.$$f.html ; \
 	done
 	# add utf8 content-type header to html versions
@@ -35,8 +34,8 @@ status:
 
 
 install: build
-	# english needs to be the last so that the last doesnt fail
-	-for f in $(LANGUAGES) en ; do \
+	# FIXME: replace with $LANGUAGES when the arkitektur document is not build seperatly anymore 
+	for f in da de es nb nl pt_BR en ; do \
 		mkdir -p $(DESTDIR)$(DESTPATH)/$$f ; \
 		if [ -e release-manual.$$f.html ] ; then \
 			cp release-manual.$$f.html $(DESTDIR)$(DESTPATH)/$$f/release-manual.html ; \
@@ -58,8 +57,8 @@ install: build
 			  else \
 			    ln -sf ../en/images $(DESTDIR)$(DESTPATH)/$$f/images ; \
 			  fi ; \
+			  dblatex -T db2latex -p release-manual.xsl -o $(DESTDIR)$(DESTPATH)/$$f/release-manual.pdf release-manual.$$f.xml ; \
 			fi ; \
-			dblatex -T db2latex -p release-manual.xsl -o $(DESTDIR)$(DESTPATH)/$$f/release-manual.pdf release-manual.$$f.xml ; \
 		else \
 			ln -sf ../en/release-manual.pdf $(DESTDIR)$(DESTPATH)/$$f/release-manual.pdf ; \
 			ln -sf ../en/release-manual.html $(DESTDIR)$(DESTPATH)/$$f/release-manual.html ; \
diff --git a/todo b/todo
index 589cde2..fdc5651 100644
--- a/todo
+++ b/todo
@@ -1,14 +1,13 @@
 todo
 ----
 
-This should be fixed for r1:
-
-- itil
-	- also build html version
-        - images on the wiki do not make it to the PDF and HTML version.
+There is mostly stuff left to do related to old documentation.
 
 This will not be fixed for r1, but should be fixed for r2/lenny:
 
+- itil
+	- images have been lost. Do you have them?
+	- images on the wiki do not make it to the PDF and HTML version.
 - 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 


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