[Pkg-bazaar-maint] Bug#494246: bzr: diff for NMU version 1.5-1.1

[Thomas Viehmann]

Hi,

thanks, James, for the quick OK!
For completeness I attach the bzr 1.5-1.1 NMU
with revised changelog (it seems I missed that on the
original NMU announcement) and will upload in a minute.

Kind regards

T.

diff -u bzr-1.5/debian/changelog bzr-1.5/debian/changelog
--- bzr-1.5/debian/changelog
+++ bzr-1.5/debian/changelog
@@ -1,3 +1,13 @@
+bzr (1.5-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Apply patch from upstream VCS to fix FTBFS in tools/rst2html.py
+    with older docutils. Thanks to Olivier Tétard for digging it
+    up.
+    Closes: #494246.
+
+ -- Thomas Viehmann <tv at beamnet.de>  Fri, 22 Aug 2008 20:06:37 +0200
+
 bzr (1.5-1) unstable; urgency=low
 
   * Final 1.5 release.
only in patch2:
unchanged:
--- bzr-1.5.orig/tools/rst2html.py
+++ bzr-1.5/tools/rst2html.py
@@ -19,8 +19,7 @@
 import docutils
 from docutils.core import publish_cmdline, default_description
 
-
-if docutils.__version__ <= '0.4.1':
+if True: # this is still required in the distutils trunk as-at June 2008.
     from docutils.parsers.rst.states import Body
     # we have some option names that contain dot; which is not allowed by
     # python-docutils 0.4-4 -- so monkeypatch in a better pattern