[Piuparts-commits] rev 541 - in trunk: . debian

[Holger Levsen]

Author: holger
Date: 2009-12-05 18:48:30 +0000 (Sat, 05 Dec 2009)
New Revision: 541

Modified:
   trunk/Makefile
   trunk/debian/changelog
Log:
* Makefile: workaround 559305 by calling a2x twice.  

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2009-12-05 18:43:27 UTC (rev 540)
+++ trunk/Makefile	2009-12-05 18:48:30 UTC (rev 541)
@@ -20,8 +20,10 @@
 all: install-conf install-doc install
 
 install-doc:
-	# build and install manual
-	a2x --copy -a toc -a toclevels=3 -f xhtml -r /etc/asciidoc/ README.txt
+	# build and install manual 
+	# the first a2x call is to workaround 559305 in sid, while the 2nd is for lenny
+	a2x --copy -a toc -a toclevels=3 -f xhtml -r /etc/asciidoc/ README.txt || \
+	  a2x --copy -a toc -a toclevels=3 -f xhtml README.txt
 	install -d $(docdir)/
 	for file in README.txt README.html docbook-xsl.css ; do \
 	    install -m 0755 $$file $(docdir)/ ; done

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-12-05 18:43:27 UTC (rev 540)
+++ trunk/debian/changelog	2009-12-05 18:48:30 UTC (rev 541)
@@ -3,8 +3,9 @@
   * piuparts.py:
     - Add support for using LVM snapshots. Thanks to
       Patrick Schoenfeld for the patch. (Closes: #559449)
-  * - Add support for warning on broken symlinks. Thanks to Carl Chenet for
+    - Add support for warning on broken symlinks. Thanks to Carl Chenet for
       the patch. (Closes: #440151)  
+  * Makefile: workaround 559305 by calling a2x twice.  
 
  -- Holger Levsen <holger at debian.org>  Fri, 04 Dec 2009 15:55:42 +0100