[debian-edu-commits] debian-edu/debian-edu-doc.git (#492) - wheezy (branch) updated: 1.2_20090131-7-g3c4297f

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

The branch, wheezy has been updated
       via  3c4297f77a82ef11647c278a82a25a7ce10c6fc2 (commit)
      from  9918d038a1845f8fdf48c3ccd278c53bcaec1b50 (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                                           |    6 +++
 debian/changelog                                   |    8 ++--
 documentation/{rosegarden => audacity}/Makefile    |   42 +++++++++++---------
 .../README.audacity-manual-translations}           |   20 +++++-----
 .../{rosegarden => audacity}/fixme-status.txt      |    0
 documentation/release-manual/Makefile              |   40 ++++++++++---------
 .../README.release-manual-translations             |    2 +-
 documentation/rosegarden/Makefile                  |   36 ++++++++++-------
 .../README.rosegarden-manual-translations          |    6 +--
 documentation/scripts/get_manual                   |   26 ++++++------
 documentation/scripts/start_new_translation        |   11 +++--
 documentation/scripts/update_translations          |    5 +--
 12 files changed, 112 insertions(+), 90 deletions(-)
 copy documentation/{rosegarden => audacity}/Makefile (66%)
 copy documentation/{release-manual/README.release-manual-translations => audacity/README.audacity-manual-translations} (79%)
 copy documentation/{rosegarden => audacity}/fixme-status.txt (100%)

The diff of changes is:
diff --git a/Makefile b/Makefile
index ff41ac3..b8276c1 100644
--- a/Makefile
+++ b/Makefile
@@ -11,29 +11,35 @@ all: build
 get-orig-source:
 	$(MAKE) -C $(SRCDIR)/release-manual update
 	$(MAKE) -C $(SRCDIR)/rosegarden update
+	$(MAKE) -C $(SRCDIR)/audacity update
 #	$(MAKE) -C $(SRCDIR)/norwegian update
 
 status:
 	$(MAKE) -C $(SRCDIR)/release-manual status
 	$(MAKE) -C $(SRCDIR)/rosegarden status
+	$(MAKE) -C $(SRCDIR)/audacity status
 	# the itil document has not been translated yet.
 
 build:
 	$(MAKE) -C $(SRCDIR)/release-manual build
 	$(MAKE) -C $(SRCDIR)/rosegarden build
+	$(MAKE) -C $(SRCDIR)/audacity build
 #	$(MAKE) -C $(SRCDIR)/norwegian build
 
 install:
 	$(MAKE) -C $(SRCDIR)/release-manual install
 	$(MAKE) -C $(SRCDIR)/rosegarden install
+	$(MAKE) -C $(SRCDIR)/audacity install
 #	$(MAKE) -C $(SRCDIR)/norwegian install
 
 dist-clean: clean
 	$(MAKE) -C $(SRCDIR)/release-manual dist-clean
 	$(MAKE) -C $(SRCDIR)/rosegarden dist-clean
+	$(MAKE) -C $(SRCDIR)/audacity dist-clean
 #	$(MAKE) -C $(SRCDIR)/norwegian dist-clean
 
 clean:
 	$(MAKE) -C $(SRCDIR)/release-manual clean
 	$(MAKE) -C $(SRCDIR)/rosegarden clean
+	$(MAKE) -C $(SRCDIR)/audacity clean
 #	$(MAKE) -C $(SRCDIR)/norwegian clean
diff --git a/debian/changelog b/debian/changelog
index b711584..0613116 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debian-edu-doc (1.2~20090629~5.0.1+edu0~alpha) UNRELEASED; urgency=low
+debian-edu-doc (1.2~20090630~5.0.1+edu0~alpha) UNRELEASED; urgency=low
 
   * Include the Debian Edu lenny release-manual and not the etch one anymore.
   * Adopt get_$document and get_images to deal with changes due to the
@@ -7,6 +7,7 @@ debian-edu-doc (1.2~20090629~5.0.1+edu0~alpha) UNRELEASED; urgency=low
     different manuals, the only configuration parts are in the Makefiles.
   * Generate better status about the manuals, to motivate people to write 
     missing documentation bits and to translate.
+  * Include Audacity manual also written by Alf Tonny Bät.
   * Disable build (and thus shipping) of itil document, as it can only be
     build in etch. (Closes: 458879)
   * Suppress warning in debian-edu-doc-$CC postrm scripts if 
@@ -18,12 +19,13 @@ debian-edu-doc (1.2~20090629~5.0.1+edu0~alpha) UNRELEASED; urgency=low
   * Updated README.
   * New script, debian/mail_stats_to_list to be run by cron every two weeks.
   * TODO before upload: 
-        - include audacity manual and release manual for etch
+        - include release manual for etch
         - create new packages debian-edu-doc-CC-etch, debian-edu-doc-rosegarden
           and debian-edu-doc-audacity
         - rename release-manual to debian-edu-lenny manual (and etch
           obviously)
-        - Italian translation is broken
+        - Italian translation is broken (lenny manual)
+        - Update debian/copyright to reflect new year and new audacity manual
 
  -- Holger Levsen <holger at debian.org>  Mon, 02 Feb 2009 14:06:48 +0100
 
diff --git a/documentation/rosegarden/Makefile b/documentation/audacity/Makefile
similarity index 66%
copy from documentation/rosegarden/Makefile
copy to documentation/audacity/Makefile
index bc0e4ce..3cffcff 100644
--- a/documentation/rosegarden/Makefile
+++ b/documentation/audacity/Makefile
@@ -1,13 +1,18 @@
-DESTDIR=
-DESTPATH = /usr/share/doc
-LANGUAGES = `find . -name "rosegarden-manual.*.po" | sed -e "s/.\/rosegarden-manual.//" -e "s/.po//"`
-
-url=http://wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden/
-name=rosegarden-manual.xml
-DEBIAN_EDU_DOC_TITLE="Debian Edu / Skolelinux Rosegarden manual"
-path1=DebianEdu/Documentation/Manuals/Rosegarden
+#
+# configuration here:
+#
+url=http://wiki.debian.org/DebianEdu/Documentation/Manuals/Audacity/
+name=audacity-manual
+DEBIAN_EDU_DOC_TITLE="Debian Edu / Skolelinux Audacity manual"
+path1=DebianEdu/Documentation/Manuals/Audacity
 path2='\/DebianEdu\/Documentation\/Manuals\/'
 export 
+#
+# no configuration below 
+#
+DESTDIR=
+DESTPATH = /usr/share/doc
+LANGUAGES = `find . -name "$(name).*.po" | sed -e "s/.\/$(name).//" -e "s/.po//"`
 
 all: build
 
@@ -24,36 +29,37 @@ status:
 
 build:
 	# create localized xml files
-	for i in rosegarden-manual.*.po ; do { \
-	        po4a-translate -o tags="<listitem> <emphasis>" -M UTF-8 -k 5 -f docbook -m rosegarden-manual.xml -p $$i -l $${i%.po}.xml ; \
+	for i in $(name).*.po ; do { \
+	        po4a-translate -o tags="<listitem> <emphasis>" -M UTF-8 -k 5 -f docbook -m $(name).xml -p $$i -l $${i%.po}.xml ; \
 	} done
 
 	# Ignore errors because the docbook xml is broken
 	#
 	# build the english html version
-	-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 rosegarden-manual.xml > rosegarden-manual.en.html
+	-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 $(name).xml > $(name).en.html
 	# Ignore errors because the docbook xml is broken
 	#
 	# build the other html versions
 	-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 rosegarden-manual.$$f.xml > rosegarden-manual.$$f.html ; \
+		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 $(name).$$f.xml > $(name).$$f.html ; \
 	done
 	# add utf8 content-type header to html versions
-	for f in rosegarden-manual.*.html ; do \
+	for f in $(name).*.html ; do \
 		sed -i "s%><TITLE%><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" /><TITLE%" $$f ; \
 	done
 
 install: build
 	# en needs to be first
+	# FIXME: en is build twice...
 	for f in en $(LANGUAGES) ; do \
 		export LANGPATH=$(DESTDIR)/debian-edu-doc-$$f/$(DESTPATH)/debian-edu-doc-$$f ; \
 		mkdir -p $$LANGPATH ; \
-		if [ -e rosegarden-manual.$$f.html ] ; then \
-			cp rosegarden-manual.$$f.html $$LANGPATH/rosegarden-manual.html ; \
+		if [ -e $(name).$$f.html ] ; then \
+			cp $(name).$$f.html $$LANGPATH/$(name).html ; \
 			if [ "$$f" = "en" ] ; then \
 			  mkdir $$LANGPATH/images/ ; \
 			  find images -maxdepth 1 -type f -exec cp \{\} $$LANGPATH/images/ \; ; \
-			  dblatex -T db2latex -p rosegarden-manual.xsl -o $$LANGPATH/rosegarden-manual.pdf rosegarden-manual.xml ; \
+			  dblatex -T db2latex -p $(name).xsl -o $$LANGPATH/$(name).pdf $(name).xml ; \
 			else \
 			  if [ -d images/$$f ] ; then \
 			  	mkdir $$LANGPATH/images ; \
@@ -68,7 +74,7 @@ install: build
 			  else \
 			    ln -sf ../debian-edu-doc-en/images $$LANGPATH/images ; \
 			  fi ; \
-			  mv images images_tmp_away ; dblatex -I $$LANGPATH/ -I $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/ -T db2latex -p rosegarden-manual.xsl -o $$LANGPATH/rosegarden-manual.pdf rosegarden-manual.$$f.xml ; mv images_tmp_away images ; \
+			  mv images images_tmp_away ; dblatex -I $$LANGPATH/ -I $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/ -T db2latex -p $(name).xsl -o $$LANGPATH/$(name).pdf $(name).$$f.xml ; mv images_tmp_away images ; \
 			fi ; \
 		fi ; \
 	done 		
@@ -76,6 +82,6 @@ install: build
 clean:
 	rm -f *.pdf
 	rm -f *.html
-	rm -f rosegarden-manual.*.xml
+	rm -f $(name).*.xml
 
 dist-clean:	clean
diff --git a/documentation/release-manual/README.release-manual-translations b/documentation/audacity/README.audacity-manual-translations
similarity index 79%
copy from documentation/release-manual/README.release-manual-translations
copy to documentation/audacity/README.audacity-manual-translations
index e8608c1..104b3a0 100644
--- a/documentation/release-manual/README.release-manual-translations
+++ b/documentation/audacity/README.audacity-manual-translations
@@ -1,4 +1,4 @@
-README for translators of the release-manual
+README for translators of the audacity-manual
 --------------------------------------------
 
 Before you start:
@@ -15,8 +15,8 @@ texlive-fonts-recommended texlive-fonts-extra dblatex wget xmllint
 Please note: pdflatex depends on ($texlive-packages | $tetex-packages) - we 
 need the texlive packages.
 
-For the following commands it's assumed your in the directory 
-debian-edu-doc/documentation/release-manual
+For the following commands it's assumed you're in the directory 
+debian-edu-doc/documentation/audacity
 
 
 
@@ -26,9 +26,9 @@ How to start a translation
 This only needs to be done _once_ per language:
 
 $ ./start_new_translation da	# create a new danish .po file
-$ svn add release-manual.da.po	# add it to svn
-$ vi release-manual.da.po	# better use kbabel for this :)
-$ svn ci release-manual.da.po	# commit the new translation for the first time
+$ svn add audacity-manual.da.po	# add it to svn
+$ vi audacity-manual.da.po	# better use kbabel for this :)
+$ svn ci audacity-manual.da.po	# commit the new translation for the first time
 
 
 
@@ -42,8 +42,8 @@ $ svn up			# update from svn, maybe someone else
 				# translated something
 $ ./update_translations         # updates the original from the wiki
 				# and merge it with the existing translation
-$ vi release-manual.da.po	# again, better use kbabel 
-$ svn ci release-manual.da.po	# commit your changes
+$ vi audacity-manual.da.po	# again, better use kbabel 
+$ svn ci audacity-manual.da.po	# commit your changes
 
 
 
@@ -75,7 +75,7 @@ $CC is your language. They will be picked up automatically.
 
 If you spot errors in the english version or see how it could be improved, 
 please do contribute to the english version too. Just edit the wiki at 
-http://wiki.debian.org/DebianEdu/Documentation/Etch/ - an user account 
+http://wiki.debian.org/DebianEdu/Documentation/Manuals/Audacity/ - an user account 
 is needed to edit these pages, so you will probably need to create a wiki 
 user first (via the login link).
 
@@ -85,4 +85,4 @@ the .po file to the bugreport. Instructions how to submit bugs are available
 at http://bugs.debian.org
 
 
--- Holger Levsen, holger at debian.org, last updated: 2008-07-06
+-- Holger Levsen, holger at debian.org, last updated: 2009-05-30
diff --git a/documentation/rosegarden/fixme-status.txt b/documentation/audacity/fixme-status.txt
similarity index 100%
copy from documentation/rosegarden/fixme-status.txt
copy to documentation/audacity/fixme-status.txt
diff --git a/documentation/release-manual/Makefile b/documentation/release-manual/Makefile
index 0981757..429306c 100644
--- a/documentation/release-manual/Makefile
+++ b/documentation/release-manual/Makefile
@@ -1,20 +1,24 @@
-DESTDIR=
-DESTPATH = /usr/share/doc
-LANGUAGES = `find . -name "release-manual.*.po" | sed -e "s/.\/release-manual.//" -e "s/.po//"`
-
+#
+# configuration here:
+#
 url=http://wiki.debian.org/DebianEdu/Documentation/Lenny/
-name=release-manual.xml
+name=release-manual
 DEBIAN_EDU_DOC_TITLE="Debian Edu / Skolelinux Lenny 5.0.1+edu0~alpha Release Manual"
 path1=DebianEdu/Documentation/Lenny
 path2='\/DebianEdu\/Documentation\/'
 export 
-
+#
+# no configuration below 
+#
+DESTDIR=
+DESTPATH = /usr/share/doc
+LANGUAGES = `find . -name "$(name).*.po" | sed -e "s/.\/$(name).//" -e "s/.po//"`
 
 all: build
 
 update:
-	./get_release-manual
-	./update_translations
+	../scripts/get_manual
+	../scripts/update_translations
 
 status:
 	@for f in *.po ; do \
@@ -25,22 +29,22 @@ status:
 
 build:
 	# create localized xml files
-	for i in release-manual.*.po ; do { \
-	        po4a-translate -o tags="<listitem> <emphasis>" -M UTF-8 -k 5 -f docbook -m release-manual.xml -p $$i -l $${i%.po}.xml ; \
+	for i in $(name).*.po ; do { \
+	        po4a-translate -o tags="<listitem> <emphasis>" -M UTF-8 -k 5 -f docbook -m $(name).xml -p $$i -l $${i%.po}.xml ; \
 	} done
 
 	# Ignore errors because the docbook xml is broken
 	#
 	# build the english html version
-	-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.xml > release-manual.en.html
+	-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 $(name).xml > $(name).en.html
 	# Ignore errors because the docbook xml is broken
 	#
 	# build the other html versions
 	-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 ; \
+		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 $(name).$$f.xml > $(name).$$f.html ; \
 	done
 	# add utf8 content-type header to html versions
-	for f in release-manual.*.html ; do \
+	for f in $(name).*.html ; do \
 		sed -i "s%><TITLE%><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" /><TITLE%" $$f ; \
 	done
 
@@ -50,12 +54,12 @@ install: build
 	for f in en $(LANGUAGES) ; do \
 		export LANGPATH=$(DESTDIR)/debian-edu-doc-$$f/$(DESTPATH)/debian-edu-doc-$$f ; \
 		mkdir -p $$LANGPATH ; \
-		if [ -e release-manual.$$f.html ] ; then \
-			cp release-manual.$$f.html $$LANGPATH/release-manual.html ; \
+		if [ -e $(name).$$f.html ] ; then \
+			cp $(name).$$f.html $$LANGPATH/$(name).html ; \
 			if [ "$$f" = "en" ] ; then \
 			  mkdir $$LANGPATH/images/ ; \
 			  find images -maxdepth 1 -type f -exec cp \{\} $$LANGPATH/images/ \; ; \
-			  dblatex -T db2latex -p release-manual.xsl -o $$LANGPATH/release-manual.pdf release-manual.xml ; \
+			  dblatex -T db2latex -p $(name).xsl -o $$LANGPATH/$(name).pdf $(name).xml ; \
 			else \
 			  if [ -d images/$$f ] ; then \
 			  	mkdir $$LANGPATH/images ; \
@@ -70,7 +74,7 @@ install: build
 			  else \
 			    ln -sf ../debian-edu-doc-en/images $$LANGPATH/images ; \
 			  fi ; \
-			  mv images images_tmp_away ; dblatex -I $$LANGPATH/ -I $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/ -T db2latex -p release-manual.xsl -o $$LANGPATH/release-manual.pdf release-manual.$$f.xml ; mv images_tmp_away images ; \
+			  mv images images_tmp_away ; dblatex -I $$LANGPATH/ -I $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/ -T db2latex -p $(name).xsl -o $$LANGPATH/$(name).pdf $(name).$$f.xml ; mv images_tmp_away images ; \
 			fi ; \
 		fi ; \
 	done 		
@@ -78,6 +82,6 @@ install: build
 clean:
 	rm -f *.pdf
 	rm -f *.html
-	rm -f release-manual.*.xml
+	rm -f $(name).*.xml
 
 dist-clean:	clean
diff --git a/documentation/release-manual/README.release-manual-translations b/documentation/release-manual/README.release-manual-translations
index e8608c1..f2152b4 100644
--- a/documentation/release-manual/README.release-manual-translations
+++ b/documentation/release-manual/README.release-manual-translations
@@ -75,7 +75,7 @@ $CC is your language. They will be picked up automatically.
 
 If you spot errors in the english version or see how it could be improved, 
 please do contribute to the english version too. Just edit the wiki at 
-http://wiki.debian.org/DebianEdu/Documentation/Etch/ - an user account 
+http://wiki.debian.org/DebianEdu/Documentation/Lenny/ - an user account 
 is needed to edit these pages, so you will probably need to create a wiki 
 user first (via the login link).
 
diff --git a/documentation/rosegarden/Makefile b/documentation/rosegarden/Makefile
index bc0e4ce..658d44a 100644
--- a/documentation/rosegarden/Makefile
+++ b/documentation/rosegarden/Makefile
@@ -1,13 +1,18 @@
-DESTDIR=
-DESTPATH = /usr/share/doc
-LANGUAGES = `find . -name "rosegarden-manual.*.po" | sed -e "s/.\/rosegarden-manual.//" -e "s/.po//"`
-
+#
+# configuration here:
+#
 url=http://wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden/
-name=rosegarden-manual.xml
+name=rosegarden-manual
 DEBIAN_EDU_DOC_TITLE="Debian Edu / Skolelinux Rosegarden manual"
 path1=DebianEdu/Documentation/Manuals/Rosegarden
 path2='\/DebianEdu\/Documentation\/Manuals\/'
 export 
+#
+# no configuration below 
+#
+DESTDIR=
+DESTPATH = /usr/share/doc
+LANGUAGES = `find . -name "$(name).*.po" | sed -e "s/.\/$(name).//" -e "s/.po//"`
 
 all: build
 
@@ -24,36 +29,37 @@ status:
 
 build:
 	# create localized xml files
-	for i in rosegarden-manual.*.po ; do { \
-	        po4a-translate -o tags="<listitem> <emphasis>" -M UTF-8 -k 5 -f docbook -m rosegarden-manual.xml -p $$i -l $${i%.po}.xml ; \
+	for i in $(name).*.po ; do { \
+	        po4a-translate -o tags="<listitem> <emphasis>" -M UTF-8 -k 5 -f docbook -m $(name).xml -p $$i -l $${i%.po}.xml ; \
 	} done
 
 	# Ignore errors because the docbook xml is broken
 	#
 	# build the english html version
-	-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 rosegarden-manual.xml > rosegarden-manual.en.html
+	-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 $(name).xml > $(name).en.html
 	# Ignore errors because the docbook xml is broken
 	#
 	# build the other html versions
 	-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 rosegarden-manual.$$f.xml > rosegarden-manual.$$f.html ; \
+		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 $(name).$$f.xml > $(name).$$f.html ; \
 	done
 	# add utf8 content-type header to html versions
-	for f in rosegarden-manual.*.html ; do \
+	for f in $(name).*.html ; do \
 		sed -i "s%><TITLE%><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" /><TITLE%" $$f ; \
 	done
 
 install: build
 	# en needs to be first
+	# FIXME: en is build twice...
 	for f in en $(LANGUAGES) ; do \
 		export LANGPATH=$(DESTDIR)/debian-edu-doc-$$f/$(DESTPATH)/debian-edu-doc-$$f ; \
 		mkdir -p $$LANGPATH ; \
-		if [ -e rosegarden-manual.$$f.html ] ; then \
-			cp rosegarden-manual.$$f.html $$LANGPATH/rosegarden-manual.html ; \
+		if [ -e $(name).$$f.html ] ; then \
+			cp $(name).$$f.html $$LANGPATH/$(name).html ; \
 			if [ "$$f" = "en" ] ; then \
 			  mkdir $$LANGPATH/images/ ; \
 			  find images -maxdepth 1 -type f -exec cp \{\} $$LANGPATH/images/ \; ; \
-			  dblatex -T db2latex -p rosegarden-manual.xsl -o $$LANGPATH/rosegarden-manual.pdf rosegarden-manual.xml ; \
+			  dblatex -T db2latex -p $(name).xsl -o $$LANGPATH/$(name).pdf $(name).xml ; \
 			else \
 			  if [ -d images/$$f ] ; then \
 			  	mkdir $$LANGPATH/images ; \
@@ -68,7 +74,7 @@ install: build
 			  else \
 			    ln -sf ../debian-edu-doc-en/images $$LANGPATH/images ; \
 			  fi ; \
-			  mv images images_tmp_away ; dblatex -I $$LANGPATH/ -I $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/ -T db2latex -p rosegarden-manual.xsl -o $$LANGPATH/rosegarden-manual.pdf rosegarden-manual.$$f.xml ; mv images_tmp_away images ; \
+			  mv images images_tmp_away ; dblatex -I $$LANGPATH/ -I $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/ -T db2latex -p $(name).xsl -o $$LANGPATH/$(name).pdf $(name).$$f.xml ; mv images_tmp_away images ; \
 			fi ; \
 		fi ; \
 	done 		
@@ -76,6 +82,6 @@ install: build
 clean:
 	rm -f *.pdf
 	rm -f *.html
-	rm -f rosegarden-manual.*.xml
+	rm -f $(name).*.xml
 
 dist-clean:	clean
diff --git a/documentation/rosegarden/README.rosegarden-manual-translations b/documentation/rosegarden/README.rosegarden-manual-translations
index e676c25..972e1b1 100644
--- a/documentation/rosegarden/README.rosegarden-manual-translations
+++ b/documentation/rosegarden/README.rosegarden-manual-translations
@@ -16,7 +16,7 @@ Please note: pdflatex depends on ($texlive-packages | $tetex-packages) - we
 need the texlive packages.
 
 For the following commands it's assumed your in the directory 
-debian-edu-doc/documentation/rosegarden-manual
+debian-edu-doc/documentation/rosegarden
 
 
 
@@ -75,7 +75,7 @@ $CC is your language. They will be picked up automatically.
 
 If you spot errors in the english version or see how it could be improved, 
 please do contribute to the english version too. Just edit the wiki at 
-http://wiki.debian.org/DebianEdu/Documentation/Etch/ - an user account 
+http://wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden - an user account 
 is needed to edit these pages, so you will probably need to create a wiki 
 user first (via the login link).
 
@@ -85,4 +85,4 @@ the .po file to the bugreport. Instructions how to submit bugs are available
 at http://bugs.debian.org
 
 
--- Holger Levsen, holger at debian.org, last updated: 2008-07-06
+-- Holger Levsen, holger at debian.org, last updated: 2009-05-30
diff --git a/documentation/scripts/get_manual b/documentation/scripts/get_manual
index 0aa8c77..0a5dd06 100755
--- a/documentation/scripts/get_manual
+++ b/documentation/scripts/get_manual
@@ -26,10 +26,10 @@ if [ ! $(which xmllint) ] ; then
 fi
 
 if [ "$name" = "" ] ; then 
-	echo bah
 	exit 1
 fi
 TMPFILE=$(mktemp)
+xmlfile=$name.xml
 
 DEBIAN_EDU_DOC_BUILDDATE=`date -u +%Y-%m-%d`
 
@@ -83,36 +83,36 @@ for i in `cat id` ; do
 done
 
 # paste it together
-rm -f $name
+rm -f $xmlfile
 for i in `cat id` ; do
-	cat ${i}.xml >> $name
+	cat ${i}.xml >> $xmlfile
 	rm ${i}.xml
 done
 rm id
 
-# get images and modify $name
-../scripts/get_images $name $path1
+# get images and modify $xmlfile
+../scripts/get_images $xmlfile $path1
 
 # turn links into internal references if appropriate
 # this needs to run after ./get_images
 #
 #  -0\777  read multiple lines
-perl -0\777 -pi -e "s/<ulink url='$path2(.*)\/(.*)'>(.*)\n<\/ulink>/<link linkend=\"\2\">\3<\/link>/g" $name
+perl -0\777 -pi -e "s/<ulink url='$path2(.*)\/(.*)'>(.*)\n<\/ulink>/<link linkend=\"\2\">\3<\/link>/g" $xmlfile
 
 # make it a docbook article again
-sed -i "1,/</ s#<#<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE article PUBLIC \"-//OASIS//DTD DocBook XML V4.4//EN\" \"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd\"><article><articleinfo><title>$DEBIAN_EDU_DOC_TITLE</title></articleinfo>\n<#" $name
-sed -i "$ s#>#>\n</article>#" $name
+sed -i "1,/</ s#<#<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE article PUBLIC \"-//OASIS//DTD DocBook XML V4.4//EN\" \"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd\"><article><articleinfo><title>$DEBIAN_EDU_DOC_TITLE</title></articleinfo>\n<#" $xmlfile
+sed -i "$ s#>#>\n</article>#" $xmlfile
 # remove the first two empty lines
-sed -i "1,2d" $name
+sed -i "1,2d" $xmlfile
 # clean it further
 TMPFILE2=$(mktemp)
-xmllint $name > $TMPFILE2
-mv $TMPFILE2 $name
+xmllint $xmlfile > $TMPFILE2
+mv $TMPFILE2 $xmlfile
 
 # motivate
-if [ "$(grep -v FIXMEs $name |grep FIXME)" != "" ] ; then
+if [ "$(grep -v FIXMEs $xmlfile |grep FIXME)" != "" ] ; then
 	echo "====================" >> $TMPFILE
-	echo `grep -v FIXMEs $name |grep FIXME||wc -l` FIXMEs left to fix >> $TMPFILE
+	echo `grep -v FIXMEs $xmlfile |grep FIXME||wc -l` FIXMEs left to fix >> $TMPFILE
 	echo "====================" >> $TMPFILE
 fi
 mv $TMPFILE fixme-status.txt
diff --git a/documentation/scripts/start_new_translation b/documentation/scripts/start_new_translation
index 190c106..f9efd76 100755
--- a/documentation/scripts/start_new_translation
+++ b/documentation/scripts/start_new_translation
@@ -3,7 +3,8 @@
 # this script needs to be run to start a new translation
 #
 # Author: Holger Levsen
-# Date:   2006-07-06
+# Date created: 2006-07-06
+# Last modfied: 2009-05-30
 
 if [ -z "$1" ] ; then
     echo "Usage: $0 CC"
@@ -12,17 +13,15 @@ if [ -z "$1" ] ; then
     exit 1
 fi
 
-if [ -e rosegarden-manual.$1.po ] ; then
+if [ -e $name.$1.po ] ; then
 	echo
 	echo "Translation already exists, aborting."
 	echo
-	echo "Please translate the remaining strings in rosegarden-manual.$1.po." 
+	echo "Please translate the remaining strings in $name.$1.po." 
 	exit 1
 fi
 
-./get_rosegarden-manual
-
-name=rosegarden-manual
+./get_manual
 
 po4a-gettextize -o tags="<listitem> <emphasis>" -M UTF-8 -f docbook -m $name.xml -p $name.pot
 cp $name.pot $name.$1.po
diff --git a/documentation/scripts/update_translations b/documentation/scripts/update_translations
index 59dece4..b042782 100755
--- a/documentation/scripts/update_translations
+++ b/documentation/scripts/update_translations
@@ -3,9 +3,8 @@
 # this script needs to be run to update a translation
 #
 # Author: Holger Levsen
-# Date:   2006-07-06
-
-name=rosegarden-manual
+# Date created: 2006-07-06
+# Last modfied: 2009-05-30
 
 # Update the pot file
 po4a-gettextize -o tags="<listitem> <emphasis>" -M UTF-8 -f docbook -m $name.xml -p $name.pot


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