[debian-edu-commits] debian-edu/debian-edu-doc.git (#199) - wheezy (branch) updated: 0.6.20071024-2-g6f57178

[David Prévot]

The branch, wheezy has been updated
       via  6f57178c3827702c36a30c0b5d259aaaa2360bfd (commit)
      from  cadcce4ef8e090d2f9ece1a3811e88a17dc49e56 (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                        |    8 ++++++++
 documentation/release-manual/Makefile   |   10 ++++++++--
 documentation/release-manual/build_pdfs |    2 +-
 todo                                    |    7 ++-----
 4 files changed, 19 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a4c01f1..362f973 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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
+  * release-manual.html: include images in the english version and link to
+    them from the other languages
+
+ -- Holger Levsen <holger at debian.org>  Thu, 25 Oct 2007 19:36:16 +0200
+
 debian-edu-doc (0.6.20071024) unstable; urgency=low
 
   [ Petter Reinholdtsen ]
diff --git a/documentation/release-manual/Makefile b/documentation/release-manual/Makefile
index 4670852..7354c45 100644
--- a/documentation/release-manual/Makefile
+++ b/documentation/release-manual/Makefile
@@ -34,17 +34,23 @@ status:
 
 install: build
 	# english needs to be the last so that the last doesnt fail
-	@for f in da es nb de fr nl pt_BR en ; do \
+	for f in da es nb de fr nl pt_BR en ; do \
 		mkdir -p $(DESTDIR)$(DESTPATH)/$$f ; \
 		if [ -e release-manual.$$f.pdf ] ; then \
 			cp release-manual.$$f.pdf $(DESTDIR)$(DESTPATH)/$$f/release-manual.pdf ; \
 			cp release-manual.$$f.html $(DESTDIR)$(DESTPATH)/$$f/release-manual.html ; \
+			if [ "$$f" == "en" ] ; then \
+			  cp -ax images $(DESTDIR)$(DESTPATH)/$$f/ ; \
+			else \
+			  ln -sf ../en/images $(DESTDIR)$(DESTPATH)/$$f/images ; \
+			fi ; \
 		else \
 			ln -s ../en/release-manual.pdf $(DESTDIR)$(DESTPATH)/$$f/release-manual.pdf ; \
 			ln -s ../en/release-manual.html $(DESTDIR)$(DESTPATH)/$$f/release-manual.html ; \
+		        ln -sf ../en/images $(DESTDIR)$(DESTPATH)/$$f/images ; \
 		fi ; \
 	done
-
+	
 clean:
 	rm -f *.pdf
 	rm -f *.html
diff --git a/documentation/release-manual/build_pdfs b/documentation/release-manual/build_pdfs
index 0bc24f4..d057608 100755
--- a/documentation/release-manual/build_pdfs
+++ b/documentation/release-manual/build_pdfs
@@ -14,7 +14,7 @@ dblatex -T simple -o $name.en.pdf $name.xml
 
 for i in $name.*.po ; do {
 	po4a-translate -M UTF-8 -k 5 -f docbook -m $name.xml -p $i -l ${i%.po}.xml 
-	dblatex -T simple -o ${i%.po}.pdf ${i%.po}.xml || ERROR="$ERROR $i"
+	dblatex -P imagedata.default.scale=maxwidth=10cm,maxheight=8cm -T simple -o ${i%.po}.pdf ${i%.po}.xml || ERROR="$ERROR $i"
 } 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
diff --git a/todo b/todo
index 218fe41..63c7f21 100644
--- a/todo
+++ b/todo
@@ -11,14 +11,11 @@ It would be nice to release r1 without this file :)
 
 - release-manual
 	- links in html version are broken
-	- multi-page html version missing
 	- it seems the <code> tag is not understood
+	- localize images. currently we only have english images. we need to use sed magic and images in svn to fix this.
 	- 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?
-	- images are only in the .en version at the moment. move d/r-m/images to d/r-m/images/en and 
-	  modify the xml documents for the different languages (or maybe just the dblatex call?)
-	  to use images from images/es etc.
-	- images are to big in the pdf version (at least)
+	- multi-page html version missing
 
 - architecture document
 	- has been moved to http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/Architecture


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