[debian-edu-commits] debian-edu/debian-edu-doc.git (#275) - wheezy (branch) updated: 0.7.20071108-30-gdc0d116

David Prévot taffit at alioth.debian.org
Sat Oct 5 12:15:22 UTC 2013


The branch, wheezy has been updated
       via  dc0d1163f62830142dc8b8aa98501ad76f35ab08 (commit)
      from  b6393673b04b86af47d31411c4691920a351ce4f (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                        |    5 +++--
 documentation/release-manual/Makefile   |   14 ++++++++++----
 documentation/release-manual/README     |    8 ++------
 documentation/release-manual/build_pdfs |   23 -----------------------
 todo                                    |   13 +++----------
 5 files changed, 18 insertions(+), 45 deletions(-)
 delete mode 100755 documentation/release-manual/build_pdfs

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 50ea1c9..3f09936 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,12 +10,13 @@ debian-edu-doc (0.8.20071114) unstable; urgency=low
   * Updated release manual source from the wiki.
   * release-manual/images/: prepare images per language
   * release-manual/Makefile: install localized images if they exist, otherwise
-    link to the english images
+    link to the english images. (for pdf and html version)
   * release-manual/README: improve the notes for translators
   * release-manual/get-release-manual: rewritten, now fetches chapter by
     chapter and adds id paramters to the section tags, so that links work
+  * release-manual/build_pdfs: removed, now done by Makefile
 
- -- Holger Levsen <holger at debian.org>  Wed, 14 Nov 2007 22:05:46 +0100
+ -- Holger Levsen <holger at debian.org>  Wed, 14 Nov 2007 23:06:19 +0100
 
 debian-edu-doc (0.7.20071108) unstable; urgency=low
 
diff --git a/documentation/release-manual/Makefile b/documentation/release-manual/Makefile
index ad4dfee..559601b 100644
--- a/documentation/release-manual/Makefile
+++ b/documentation/release-manual/Makefile
@@ -5,8 +5,10 @@ LANGUAGES=es nb de
 
 all: build
 build:
-	# create localized xml files and build the pdfs
-	./build_pdfs
+	# create localized xml files
+	for i in release-manual.*.po ; do { \
+	        po4a-translate -M UTF-8 -k 5 -f docbook -m release-manual.xml -p $$i -l $${i%.po}.xml ; \
+	} done
 
 	# Ignore errors because the docbook xml is broken
 	#
@@ -38,9 +40,9 @@ install: build
 	# english needs to be the last so that the last doesnt fail
 	-for f in $(LANGUAGES) 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 ; \
+		if [ -e release-manual.$$f.html ] ; then \
 			cp release-manual.$$f.html $(DESTDIR)$(DESTPATH)/$$f/release-manual.html ; \
+			cp release-manual.$$f.xml $(DESTDIR)$(DESTPATH)/$$f/release-manual.xml ; \
 			if [ "$$f" == "en" ] ; then \
 			  mkdir $(DESTDIR)$(DESTPATH)/$$f/images/ ; \
 			  find images -type f -maxdepth 1 -exec cp \{\} $(DESTDIR)$(DESTPATH)/$$f/images/ \; ; \
@@ -59,6 +61,10 @@ install: build
 			    ln -sf ../en/images $(DESTDIR)$(DESTPATH)/$$f/images ; \
 			  fi ; \
 			fi ; \
+			cd $(DESTDIR)$(DESTPATH)/$$f ; \
+			dblatex -P imagedata.default.scale=maxwidth=10cm,maxheight=8cm -T simple -o release-manual.pdf release-manual.xml ; \
+			rm release-manual.xml ; \
+			cd - ; \
 		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 ; \
diff --git a/documentation/release-manual/README b/documentation/release-manual/README
index 0de63e8..6a1d715 100644
--- a/documentation/release-manual/README
+++ b/documentation/release-manual/README
@@ -31,12 +31,8 @@ $ ./update_translations
 $ vi release-manual.de.po
 $ svn ci release-manual.de.po
 
-How to build the pdfs
----------------------
-$ ./build_pdfs
-
-How to build the html version
------------------------------
+How to build the html and pdf version
+-------------------------------------
 $ make
 
 Don't add generated files to svn
diff --git a/documentation/release-manual/build_pdfs b/documentation/release-manual/build_pdfs
deleted file mode 100755
index d057608..0000000
--- a/documentation/release-manual/build_pdfs
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# this script needs to be run to build the pdfs
-#
-# Author: Holger Levsen
-# Date:   2006-07-06
-
-set -e
-
-name=release-manual
-ERROR=""
-
-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 -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
-echo "Have fun!"
-
-
diff --git a/todo b/todo
index b1216e7..332440a 100644
--- a/todo
+++ b/todo
@@ -3,18 +3,10 @@ todo
 
 This should be fixed for r1:
 
-- general
-	- update README.release-manual-translations 
 - itil
 	- also build html version
 	- use the same scripts for building as the release manual
         - images on the wiki do not make it to the PDF and HTML version.
-
-- release-manual
-	- localize images for the pdf version too
-	- 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
 	- pdf version only sometimes comes out with page numbers in the index
@@ -30,8 +22,9 @@ This will not be fixed for r1, but should be fixed for r2/lenny:
 	- we need to come up with a solution to "/usr/bin/sed" the translated strings 
 	  into the image. That looks easy: .dia files are just compressed xml 
 	  files, so we just need to sed the strings in there :)
-
-
+- release-manual
+	- 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?
 - other docs:
 	- svn://svn.skolelinux.org/repos/skolelinux/trunk/www/developer.skolelinux.no/artikler/skolelinux-do-ocracy.txt might also be interesting
 


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




More information about the debian-edu-commits mailing list