[debian-edu-commits] debian-edu/debian-edu-doc.git (#53) - wheezy (branch) updated: 0.4.20070713-10-g7bbf03b

[David Prévot]

The branch, wheezy has been updated
       via  7bbf03b8b05d705a2ae006f7075cd31479a8adb1 (commit)
      from  1f22d40a88a4966a3e0c721bb7f16451b5157c7c (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                        |    2 +-
 documentation/release-manual/Makefile   |   11 +++++++++--
 documentation/release-manual/build_pdfs |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 051e49b..b98ea7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ debian-edu-doc (0.4.20070714) UNRELEASED; urgency=low
     keep the files fetched by the update until explicitly removed.
   * Update translation files for release-manual.
   * Update build rules for release-manual and install them as part
-    of this package.
+    of this package.  Install HTML version as well.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 14 Jul 2007 11:12:04 +0100
 
diff --git a/documentation/release-manual/Makefile b/documentation/release-manual/Makefile
index f2b11cf..bc4141d 100644
--- a/documentation/release-manual/Makefile
+++ b/documentation/release-manual/Makefile
@@ -4,6 +4,12 @@ DESTPATH = /usr/share/doc/debian-edu-doc
 all: build
 build:
 	./build_pdfs
+
+# Ignore errors because the docbook xml is broken
+	-docbook2html --nochunks  release-manual.xml ; mv release-manual.html release-manual.en.html
+	-for f in *.xml ; do \
+		docbook2html --nochunks $$f; \
+	done
 update:
 	./get_release-manual
 	./update_translations
@@ -17,10 +23,11 @@ status:
 
 install: build
 	for f in en es ; do \
-		mkdir -p $(DESTDIR)$(DESTPATH)/$$f/release-manual; \
-		cp release-manual.$$f.pdf $(DESTDIR)$(DESTPATH)/$$f/release-manual/. ; \
+		cp release-manual.$$f.pdf $(DESTDIR)$(DESTPATH)/$$f/release-manual.pdf ; \
+		cp release-manual.$$f.html $(DESTDIR)$(DESTPATH)/$$f/release-manual.html ; \
 	done
 
 clean:
 	rm -f *.pdf
+	rm -f *.html
 	rm -f release-manual.*.xml
diff --git a/documentation/release-manual/build_pdfs b/documentation/release-manual/build_pdfs
index 8045b8b..02a0153 100755
--- a/documentation/release-manual/build_pdfs
+++ b/documentation/release-manual/build_pdfs
@@ -5,7 +5,7 @@
 # Author: Holger Levsen
 # Date:   2006-07-06
 
-
+set -e
 
 name=release-manual
 ERROR=""


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