[debian-edu-commits] debian-edu/debian-edu-doc.git (#193) - wheezy (branch) updated: 0.6.20070721-67-gd605d81

[David Prévot]

The branch, wheezy has been updated
       via  d605d81cc245745f0cc6ce4232f1f82bbf0e1be5 (commit)
      from  31419dcc79f71a470518823985c69f6dd7cbabfd (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 ++++---
 documentation/release-manual/Makefile   |   14 +++++++++++++-
 documentation/release-manual/build_pdfs |    2 +-
 todo                                    |    6 ------
 4 files changed, 18 insertions(+), 11 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 25abd09..5c27baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debian-edu-doc (0.6.20071023) unstable; urgency=low
+debian-edu-doc (0.6.20071024) unstable; urgency=low
 
   * UNRELEASED.
   [ Petter Reinholdtsen ]
@@ -23,9 +23,10 @@ debian-edu-doc (0.6.20071023) unstable; urgency=low
   * Updated release manual source from the wiki.
   * modified get_images.pl because the worldmap is now a png like the rest
   * build the translated versions of the document already if only 5% of the
-    document are translated, not 80% 
+    document are translated, not 80%
+  * use sed to fix html versions of the release manual to use utf8
 
- -- Holger Levsen <holger at debian.org>  Tue, 23 Oct 2007 14:05:22 +0200
+ -- Holger Levsen <holger at debian.org>  Wed, 24 Oct 2007 13:18:50 +0200
 
 debian-edu-doc (0.6.20070721) unstable; urgency=low
 
diff --git a/documentation/release-manual/Makefile b/documentation/release-manual/Makefile
index 70a3271..4670852 100644
--- a/documentation/release-manual/Makefile
+++ b/documentation/release-manual/Makefile
@@ -3,13 +3,25 @@ DESTPATH = /usr/share/doc/debian-edu-doc
 
 all: build
 build:
+	# create localized xml files and build the pdfs
 	./build_pdfs
 
-# Ignore errors because the docbook xml is broken
+	# Ignore errors because the docbook xml is broken
+	#
+	# build the english html version
 	-docbook2html --nochunks  release-manual.xml ; mv release-manual.html release-manual.en.html
+	# Ignore errors because the docbook xml is broken
+	#
+	# build the other html versions
 	-for f in release-manual.*.xml ; do \
 		docbook2html --nochunks $$f; \
 	done
+	# add utf8 content-type header to html versions
+	for f in release-manual.*.html ; do \
+		cat $$f | sed "s%><TITLE%><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" /><TITLE%" > $$f.new ; \
+		rm $$f ; \
+		mv $$f.new $$f ; \
+	done
 update:
 	./update_translations # calls ./get-release-manual
 
diff --git a/documentation/release-manual/build_pdfs b/documentation/release-manual/build_pdfs
index 1996678..0bc24f4 100755
--- a/documentation/release-manual/build_pdfs
+++ b/documentation/release-manual/build_pdfs
@@ -17,7 +17,7 @@ for i in $name.*.po ; do {
 	dblatex -T simple -o ${i%.po}.pdf ${i%.po}.xml || ERROR="$ERROR $i"
 } done
 
-for i in $ERROR ; do echo "$i could not be build, you need to translate more" ; done
+for i in $ERROR ; do echo "WARNING: $i could not be build, you either need to translate more or the .po file is broken and you need to fix it" ; done
 echo "Have fun!"
 
 
diff --git a/todo b/todo
index 3af17d9..218fe41 100644
--- a/todo
+++ b/todo
@@ -10,12 +10,6 @@ It would be nice to release r1 without this file :)
         - images on the wiki do not make it to the PDF and HTML version.
 
 - release-manual
-	- in the html version there is a problem with the
-          codification: all accents, ñ, and umlauts etc. are totally broken. I have 
-	  never used docbook, but including in the html code a line with:
-	  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	  would fix it, and should work with all the languages.I guess that's
-	  something docbook can do some way...
 	- links in html version are broken
 	- multi-page html version missing
 	- it seems the <code> tag is not understood


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