[Pkg-bazaar-maint] Bug#686859: (no subject)

[Jelmer Vernooij]

tags 686859 +patch
thanks

The attached patch fixes this issue in unstable. Unfortunately I
haven't gotten it to build because of some unrelated build problems.

-------------- next part --------------
diff -Nru bzr-2.6.0~bzr6526/debian/changelog bzr-2.6.0~bzr6526/debian/changelog
--- bzr-2.6.0~bzr6526/debian/changelog	2012-06-22 03:17:16.000000000 +0200
+++ bzr-2.6.0~bzr6526/debian/changelog	2012-10-14 14:22:20.000000000 +0200
@@ -1,3 +1,10 @@
+bzr (2.6.0~bzr6526-2) unstable; urgency=low
+
+  * Fix trivial syntax error in Japanese docs that causes breakage with
+    docutils 0.9.1. Closes: #686859
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Sun, 14 Oct 2012 14:20:14 +0200
+
 bzr (2.6.0~bzr6526-1) unstable; urgency=low
 
   * New upstream snapshot.
diff -Nru bzr-2.6.0~bzr6526/debian/control bzr-2.6.0~bzr6526/debian/control
--- bzr-2.6.0~bzr6526/debian/control	2012-06-19 13:29:39.000000000 +0200
+++ bzr-2.6.0~bzr6526/debian/control	2012-10-14 15:35:01.000000000 +0200
@@ -19,7 +19,8 @@
                python-paramiko,
                python-pycurl-dbg,
                python-subunit,
-               python-testtools (>= 0.9.5~)
+               python-testtools (>= 0.9.5~),
+               libcurl3-nss
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.6
 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr/2.6
diff -Nru bzr-2.6.0~bzr6526/debian/patches/04_docutils_0.9.1 bzr-2.6.0~bzr6526/debian/patches/04_docutils_0.9.1
--- bzr-2.6.0~bzr6526/debian/patches/04_docutils_0.9.1	1970-01-01 01:00:00.000000000 +0100
+++ bzr-2.6.0~bzr6526/debian/patches/04_docutils_0.9.1	2012-10-14 14:22:04.000000000 +0200
@@ -0,0 +1,19 @@
+Description: Fix syntax error in Japanese docs that breaks docutils 0.9.1
+Bug: http://bugs.launchpad.net/514301
+Bug-Debian: http://bugs.debian.org/686859
+Author: Jelmer Vernooij <jelmer at debian.org>
+Status: Cherry-picked from upstream
+
+=== modified file 'doc/ja/user-guide/http_smart_server.txt'
+--- old/doc/ja/user-guide/http_smart_server.txt	2011-05-18 06:01:08 +0000
++++ new/doc/ja/user-guide/http_smart_server.txt	2012-10-13 15:05:46 +0000
+@@ -158,7 +158,7 @@
+ 
+     fcgi.WSGIServer(smart_server_app).run()
+         
+-?`fcgi`???????http://svn.saddi.com/py-lib/trunk/fcgi.py????????
++?`fcgi` ???????http://svn.saddi.com/py-lib/trunk/fcgi.py????????
+ ??? flup_ ??????
+ 
+ .. _flup: http://www.saddi.com/software/flup/
+
diff -Nru bzr-2.6.0~bzr6526/debian/patches/series bzr-2.6.0~bzr6526/debian/patches/series
--- bzr-2.6.0~bzr6526/debian/patches/series	2012-06-19 13:29:39.000000000 +0200
+++ bzr-2.6.0~bzr6526/debian/patches/series	2012-10-14 14:19:10.000000000 +0200
@@ -1,3 +1,4 @@
 01_selftest_package
 02_external_configobj
 03_spurious_test_failure
+04_docutils_0.9.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-bazaar-maint/attachments/20121014/27831b52/attachment.pgp>