Merge lp:~mitya57/ubuntu/quantal/python-docutils/resync into lp:ubuntu/quantal/python-docutils

[Dimitri John Ledkov]

When branch is ready, please propose it for merging.

[Dimitri John Ledkov (xnox)]

Here is the review of your proposed changes:
* Now that the test is fixed, disable-DocutilsXMLTestCase.diff patch should be dropped from debian/patches/series
* docbook-to-man has been dropped in Debian (see changelog), it should be dropped in debian/control
* there conflict markers debian/changelog, did you merge lp:debian/docutils into lp:ubuntu/docutils when you were preparing the merge?

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

$ bzr init-repo python-docutils
$ cd python-docutils
$ bzr branch lp:ubuntu/python-docutils ubuntu
$ bzr branch lp:debian/python-docutils debian
$ cd debian
$ bzr merge ../ubuntu

Is how I start merges. This has a better chance of not loosing ubuntu changes & making sure it will be possible to merge it back into lp:ubuntu/package without conflicts.

[lp:~mitya57/ubuntu/quantal/python-docutils/resync]

23. By Dmitry Shachnev on 2012-08-19

Merge lp:ubuntu/python-docutils

This adds missing entry in debian/control and bumps python-all build-dependency
to the required ">= 2.6.6-3~" value

[Dmitry Shachnev (mitya57)]

All conflicts resolved now.

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2012-08-19 07:58:22 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2012-08-19 07:58:22 +0000
@@ -0,0 +1,1 @@
+series

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-12-17 14:11:08 +0000
+++ .pc/applied-patches	2012-08-19 07:58:22 +0000
@@ -9,5 +9,7 @@
 add-missing-import.diff
 fix-error-reporting-encoding-issues.diff
 fix-io-encoding-issues.diff
+fix-docutilsxmltestcase.diff
+fix-docutilsxmltestcase-debian.diff
+no-test-skipping.diff
 move-data-to-usr-share.diff
-disable-DocutilsXMLTestCase.diff

=== removed directory '.pc/disable-DocutilsXMLTestCase.diff'
=== removed directory '.pc/disable-DocutilsXMLTestCase.diff/test'
=== removed directory '.pc/disable-DocutilsXMLTestCase.diff/test/test_writers'
=== removed file '.pc/disable-DocutilsXMLTestCase.diff/test/test_writers/test_docutils_xml.py'
--- .pc/disable-DocutilsXMLTestCase.diff/test/test_writers/test_docutils_xml.py	2011-12-17 14:11:08 +0000
+++ .pc/disable-DocutilsXMLTestCase.diff/test/test_writers/test_docutils_xml.py	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-#!/usr/bin/env python
-
-# $Id: test_docutils_xml.py 5889 2009-04-01 20:00:21Z gbrandl $
-# Author: Lea Wiemann <[e-mail]>
-# Copyright: This module has been placed in the public domain.
-
-"""
-Test for docutils XML writer.
-"""
-
-from __init__ import DocutilsTestSupport
-
-import docutils
-import docutils.core
-from docutils._compat import b
-
-
-class DocutilsXMLTestCase(DocutilsTestSupport.StandardTestCase):
-
-    input = b("""\
-Test
-
-----------
-
-Test. \xc3\xa4\xc3\xb6\xc3\xbc\xe2\x82\xac""")
-    xmldecl = b('<?xml version="1.0" encoding="iso-8859-1"?>\n')
-    doctypedecl = b('<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">\n')
-    generatedby = b('<!-- Generated by Docutils %s -->\n' % docutils.__version__)
-    bodynormal = b('<document source="&lt;string&gt;"><paragraph>Test</paragraph><transition/><paragraph>Test. \xe4\xf6\xfc&#8364;</paragraph></document>')
-    bodynewlines = b("""\
-<document source="&lt;string&gt;">
-<paragraph>
-Test
-</paragraph>
-<transition/>
-<paragraph>
-Test. \xe4\xf6\xfc&#8364;
-</paragraph>
-</document>
-""")
-    bodyindents = b("""\
-<document source="&lt;string&gt;">
-    <paragraph>
-        Test
-    </paragraph>
-    <transition/>
-    <paragraph>
-        Test. \xe4\xf6\xfc&#8364;
-    </paragraph>
-</document>
-""")
-
-    def test_publish(self):
-        settings = {'input_encoding': 'utf8',
-                    'output_encoding': 'iso-8859-1',
-                    '_disable_config': 1}
-        for settings['newlines'] in 0, 1:
-            for settings['indents'] in 0, 1:
-                for settings['xml_declaration'] in 0, 1:
-                    for settings['doctype_declaration'] in 0, 1:
-
-                        expected = b('')
-                        if settings['xml_declaration']:
-                            expected += self.xmldecl
-                        if settings['doctype_declaration']:
-                            expected += self.doctypedecl
-                        expected += self.generatedby
-                        if settings['indents']:
-                            expected += self.bodyindents
-                        elif settings['newlines']:
-                            expected += self.bodynewlines
-                        else:
-                            expected += self.bodynormal
-
-                        self.assertEqual(docutils.core.publish_string
-                                         (source=self.input,
-                                          reader_name='standalone',
-                                          writer_name='docutils_xml',
-                                          settings_overrides=settings),
-                                         expected)
-
-
-if __name__ == '__main__':
-    import unittest
-    unittest.main()

=== added directory '.pc/fix-docutilsxmltestcase-debian.diff'
=== added directory '.pc/fix-docutilsxmltestcase-debian.diff/test'
=== added directory '.pc/fix-docutilsxmltestcase-debian.diff/test/test_writers'
=== added file '.pc/fix-docutilsxmltestcase-debian.diff/test/test_writers/test_docutils_xml.py'
--- .pc/fix-docutilsxmltestcase-debian.diff/test/test_writers/test_docutils_xml.py	1970-01-01 00:00:00 +0000
+++ .pc/fix-docutilsxmltestcase-debian.diff/test/test_writers/test_docutils_xml.py	2012-08-19 07:58:22 +0000
@@ -0,0 +1,107 @@
+#!/usr/bin/env python
+
+# $Id: test_docutils_xml.py 5889 2009-04-01 20:00:21Z gbrandl $
+# Author: Lea Wiemann <[e-mail]>
+# Copyright: This module has been placed in the public domain.
+
+"""
+Test for docutils XML writer.
+"""
+
+from __init__ import DocutilsTestSupport
+
+import sys
+import docutils
+import docutils.core
+from docutils._compat import b
+
+
+class DocutilsXMLTestCase(DocutilsTestSupport.StandardTestCase):
+
+    input = b("""\
+Test
+
+----------
+
+Test. \xc3\xa4\xc3\xb6\xc3\xbc\xe2\x82\xac""")
+    xmldecl = b('<?xml version="1.0" encoding="iso-8859-1"?>\n')
+    doctypedecl = b('<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">\n')
+    generatedby = b('<!-- Generated by Docutils %s -->\n' % docutils.__version__)
+    bodynormal = b('<document source="&lt;string&gt;"><paragraph>Test</paragraph><transition/><paragraph>Test. \xe4\xf6\xfc&#8364;</paragraph></document>')
+    bodynewlines = b("""\
+<document source="&lt;string&gt;">
+<paragraph>Test</paragraph>
+<transition/>
+<paragraph>Test. \xe4\xf6\xfc&#8364;</paragraph>
+</document>
+""")
+    bodynewlines_old = b("""\
+<document source="&lt;string&gt;">
+<paragraph>
+Test
+</paragraph>
+<transition/>
+<paragraph>
+Test. \xe4\xf6\xfc&#8364;
+</paragraph>
+</document>
+""")
+    bodyindents = b("""\
+<document source="&lt;string&gt;">
+    <paragraph>Test</paragraph>
+    <transition/>
+    <paragraph>Test. \xe4\xf6\xfc&#8364;</paragraph>
+</document>
+""")
+    bodyindents_old = b("""\
+<document source="&lt;string&gt;">
+    <paragraph>
+        Test
+    </paragraph>
+    <transition/>
+    <paragraph>
+        Test. \xe4\xf6\xfc&#8364;
+    </paragraph>
+</document>
+""")
+
+    def test_publish(self):
+        settings = {'input_encoding': 'utf8',
+                    'output_encoding': 'iso-8859-1',
+                    '_disable_config': 1}
+        for settings['newlines'] in 0, 1:
+            for settings['indents'] in 0, 1:
+                for settings['xml_declaration'] in 0, 1:
+                    for settings['doctype_declaration'] in 0, 1:
+
+                        expected = b('')
+                        if settings['xml_declaration']:
+                            expected += self.xmldecl
+                        if settings['doctype_declaration']:
+                            expected += self.doctypedecl
+                        expected += self.generatedby
+                        if settings['indents']:
+                            expected += self.bodyindents
+                        elif settings['newlines']:
+                            expected += self.bodynewlines
+                        else:
+                            expected += self.bodynormal
+
+                        self.assertEqual(docutils.core.publish_string
+                                         (source=self.input,
+                                          reader_name='standalone',
+                                          writer_name='docutils_xml',
+                                          settings_overrides=settings),
+                                         expected)
+
+    # New formatting introduced in versions 2.7.3 and 3.2.3 on 2011-11-18
+    # to fix http://bugs.python.org/issue4147
+    if (sys.version_info < (2, 7, 3) or
+        sys.version_info[0] == 3 and sys.version_info < (3, 2, 3)):
+        bodynewlines = bodynewlines_old
+        bodyindents = bodyindents_old
+
+
+if __name__ == '__main__':
+    import unittest
+    unittest.main()

=== added directory '.pc/fix-docutilsxmltestcase.diff'
=== added directory '.pc/fix-docutilsxmltestcase.diff/test'
=== added directory '.pc/fix-docutilsxmltestcase.diff/test/test_writers'
=== added file '.pc/fix-docutilsxmltestcase.diff/test/test_writers/test_docutils_xml.py'
--- .pc/fix-docutilsxmltestcase.diff/test/test_writers/test_docutils_xml.py	1970-01-01 00:00:00 +0000
+++ .pc/fix-docutilsxmltestcase.diff/test/test_writers/test_docutils_xml.py	2012-08-19 07:58:22 +0000
@@ -0,0 +1,85 @@
+#!/usr/bin/env python
+
+# $Id: test_docutils_xml.py 5889 2009-04-01 20:00:21Z gbrandl $
+# Author: Lea Wiemann <[e-mail]>
+# Copyright: This module has been placed in the public domain.
+
+"""
+Test for docutils XML writer.
+"""
+
+from __init__ import DocutilsTestSupport
+
+import docutils
+import docutils.core
+from docutils._compat import b
+
+
+class DocutilsXMLTestCase(DocutilsTestSupport.StandardTestCase):
+
+    input = b("""\
+Test
+
+----------
+
+Test. \xc3\xa4\xc3\xb6\xc3\xbc\xe2\x82\xac""")
+    xmldecl = b('<?xml version="1.0" encoding="iso-8859-1"?>\n')
+    doctypedecl = b('<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">\n')
+    generatedby = b('<!-- Generated by Docutils %s -->\n' % docutils.__version__)
+    bodynormal = b('<document source="&lt;string&gt;"><paragraph>Test</paragraph><transition/><paragraph>Test. \xe4\xf6\xfc&#8364;</paragraph></document>')
+    bodynewlines = b("""\
+<document source="&lt;string&gt;">
+<paragraph>
+Test
+</paragraph>
+<transition/>
+<paragraph>
+Test. \xe4\xf6\xfc&#8364;
+</paragraph>
+</document>
+""")
+    bodyindents = b("""\
+<document source="&lt;string&gt;">
+    <paragraph>
+        Test
+    </paragraph>
+    <transition/>
+    <paragraph>
+        Test. \xe4\xf6\xfc&#8364;
+    </paragraph>
+</document>
+""")
+
+    def test_publish(self):
+        settings = {'input_encoding': 'utf8',
+                    'output_encoding': 'iso-8859-1',
+                    '_disable_config': 1}
+        for settings['newlines'] in 0, 1:
+            for settings['indents'] in 0, 1:
+                for settings['xml_declaration'] in 0, 1:
+                    for settings['doctype_declaration'] in 0, 1:
+
+                        expected = b('')
+                        if settings['xml_declaration']:
+                            expected += self.xmldecl
+                        if settings['doctype_declaration']:
+                            expected += self.doctypedecl
+                        expected += self.generatedby
+                        if settings['indents']:
+                            expected += self.bodyindents
+                        elif settings['newlines']:
+                            expected += self.bodynewlines
+                        else:
+                            expected += self.bodynormal
+
+                        self.assertEqual(docutils.core.publish_string
+                                         (source=self.input,
+                                          reader_name='standalone',
+                                          writer_name='docutils_xml',
+                                          settings_overrides=settings),
+                                         expected)
+
+
+if __name__ == '__main__':
+    import unittest
+    unittest.main()

=== added directory '.pc/no-test-skipping.diff'
=== added directory '.pc/no-test-skipping.diff/test'
=== added directory '.pc/no-test-skipping.diff/test/test_writers'
=== added file '.pc/no-test-skipping.diff/test/test_writers/test_odt.py'
--- .pc/no-test-skipping.diff/test/test_writers/test_odt.py	1970-01-01 00:00:00 +0000
+++ .pc/no-test-skipping.diff/test/test_writers/test_odt.py	2012-08-19 07:58:22 +0000
@@ -0,0 +1,185 @@
+#!/usr/bin/env python
+
+# $Id: test_odt.py 6989 2011-03-04 23:44:32Z dkuhlman $
+# Author: Dave Kuhlman <[e-mail]>
+# Copyright: This module has been placed in the public domain.
+
+"""
+Tests for docutils odtwriter.
+
+Instructions for adding a new test:
+
+1. Add a new method to class DocutilsOdtTestCase (below) named
+   test_odt_xxxx, where xxxx describes your new feature.  See
+   test_odt_basic for an example.
+
+2. Add a new input reST (.txt) file in test/functional/input. This
+   file should contain the smallest amount of reST that tests your
+   new feature.  Name this file odt_xxxx.txt.
+
+3. Convert your input reST (.txt) file to an ODF (.odt) file using
+   rst2odt.py.  Place this ODF (.odt) file in
+   test/functional/expected.  Name this file odt_xxxx.odt.
+   You can also pass parameter save_output_name='filename' to method
+   process_test() in order to produce expected output.
+   See and modify variable TEMP_FILE_PATH for destination.
+
+4. Run your test.  Your new test should pass.
+
+5. If any other tests fail, that's a possible regression.
+
+"""
+
+import sys
+import os
+import StringIO
+import zipfile
+from xml.dom import minidom
+import tempfile
+
+from __init__ import DocutilsTestSupport
+
+import docutils
+import docutils.core
+from docutils._compat import BytesIO
+
+#
+# Globals
+TEMP_FILE_PATH = '/tmp'
+INPUT_PATH = 'functional/input/'
+EXPECTED_PATH = 'functional/expected/'
+
+
+class DocutilsOdtTestCase(DocutilsTestSupport.StandardTestCase):
+
+    #
+    # Check to see if we can import the needed XML library.
+    # Report failure if we cannot.
+    def check_import(self):
+        WhichElementTree = ''
+        try:
+            # 1. Try to use lxml.
+            #from lxml import etree
+            #WhichElementTree = 'lxml'
+            raise ImportError('Ignoring lxml')
+        except ImportError, e:
+            try:
+                # 2. Try to use ElementTree from the Python standard library.
+                from xml.etree import ElementTree as etree
+                WhichElementTree = 'elementtree'
+            except ImportError, e:
+                try:
+                    # 3. Try to use a version of ElementTree installed as a separate
+                    #    product.
+                    from elementtree import ElementTree as etree
+                    WhichElementTree = 'elementtree'
+                except ImportError, e:
+                    s1 = '\nSkipped test of odf_odt writer.  ' \
+                         'In order to test odf_odt writer ' \
+                         'must install either a version of Python containing ' \
+                         'ElementTree (Python version >=2.5) or ' \
+                         'install ElementTree.\n\n'
+                    #self.fail(s1)
+                    sys.stderr.write(s1)
+        return WhichElementTree
+
+    def process_test(self, input_filename, expected_filename, 
+            save_output_name=None, settings_overrides=None):
+        if not self.check_import():
+            return
+        # Test that xmlcharrefreplace is the default output encoding
+        # error handler.
+        input_file = open(INPUT_PATH + input_filename, 'rb')
+        expected_file = open(EXPECTED_PATH + expected_filename, 'rb')
+        input = input_file.read()
+        expected = expected_file.read()
+        input_file.close()
+        expected_file.close()
+        if settings_overrides is None:
+            settings_overrides={ }
+        result = docutils.core.publish_string(
+            source=input,
+            reader_name='standalone',
+            writer_name='odf_odt',
+            settings_overrides=settings_overrides)
+##         msg = 'file length not equal: expected length: %d  actual length: %d' % (
+##             len(expected), len(result), )
+##         self.assertEqual(str(len(result)), str(len(expected)))
+        if save_output_name:
+            filename = '%s%s%s' % (TEMP_FILE_PATH, os.sep, save_output_name,)
+            outfile = open(filename, 'w')
+            outfile.write(result)
+            outfile.close()
+        content1 = self.extract_file(result, 'content.xml')
+        content2 = self.extract_file(expected, 'content.xml')
+        msg = 'content.xml not equal: expected len: %d  actual len: %d' % (
+            len(content2), len(content1), )
+        self.assertEqual(content1, content2, msg)
+
+    def extract_file(self, payload, filename):
+        payloadfile = BytesIO()
+        payloadfile.write(payload)
+        payloadfile.seek(0)
+        zfile = zipfile.ZipFile(payloadfile, 'r')
+        content1 = zfile.read(filename)
+        doc = minidom.parseString(content1)
+        #content2 = doc.toprettyxml(indent='  ')
+        content2 = doc.toxml()
+        return content2
+
+    def assertEqual(self, first, second, msg=None):
+        if msg is None:
+            msg2 = msg
+        else:
+            sep = '+' * 60
+            msg1 = '\n%s\nresult:\n%s\n%s\nexpected:\n%s\n%s' % (
+                sep, first, sep, second, sep, )
+            #msg2 = '%s\n%s' % (msg1, msg, )
+            msg2 = '%s' % (msg, )
+        DocutilsTestSupport.StandardTestCase.failUnlessEqual(self,
+            first, second, msg2)
+
+    #
+    # Unit test methods
+    #
+    # All test methods should be named "test_odt_xxxx", where
+    #     xxxx is replaced with a name for the new test.
+    # See instructions above in module doc-string.
+    #
+
+    def test_odt_basic(self):
+        self.process_test('odt_basic.txt', 'odt_basic.odt',
+            #save_output_name='odt_basic.odt'
+            )
+
+    def test_odt_tables1(self):
+        self.process_test('odt_tables1.txt', 'odt_tables1.odt',
+            #save_output_name='odt_tables1.odt'
+            )
+
+    def test_odt_custom_headfoot(self):
+        settings_overrides = {
+            'custom_header': 'Page %p% of %P%',
+            'custom_footer': 'Title: %t%  Date: %d3%  Time: %t4%',
+            }
+        self.process_test('odt_custom_headfoot.txt', 'odt_custom_headfoot.odt',
+            settings_overrides=settings_overrides,
+            #save_output_name='odt_custom_headfoot.odt'
+            )
+
+    #
+    # Template for new tests.
+    # Also add functional/input/odt_xxxx.txt and
+    #   functional/expected/odt_xxxx.odt
+    # Replace all xxxx with name of your test.
+    #
+##     def test_odt_xxxx(self):
+##         self.process_test('odt_xxxx.txt', 'odt_xxxx.odt')
+
+
+# -----------------------------------------------------------------
+
+
+if __name__ == '__main__':
+    import unittest
+    unittest.main()

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-17 14:11:08 +0000
+++ debian/changelog	2012-08-19 07:58:22 +0000
@@ -1,3 +1,74 @@
+python-docutils (0.8.1-8ubuntu1) quantal; urgency=low
+
+  * Resynchronize with Debian unstable (LP: #1038470), remaining change:
+    - Use dh_python2 instead of dh_pysupport
+
+ -- Dmitry Shachnev <[e-mail]>  Sat, 18 Aug 2012 20:16:07 +0400
+
+python-docutils (0.8.1-8) unstable; urgency=low
+
+  * Install all DTD files (really closes: #531170).
+
+ -- Jakub Wilk <[e-mail]>  Wed, 04 Jul 2012 14:07:30 +0200
+
+python-docutils (0.8.1-7) unstable; urgency=low
+
+  * Rebuild against debhelper (>= 9.20120528) to fix postinst that
+    unconditionally overwrites files in /etc (see: #477751, closes: #675489).
+    Thanks to Helmut Grohne for the bug report.
+
+ -- Jakub Wilk <[e-mail]>  Fri, 01 Jun 2012 18:20:46 +0200
+
+python-docutils (0.8.1-6) unstable; urgency=low
+
+  * Fix a typo in a patch description.
+  * Bump standards version to 3.9.3 (no changes needed).
+  * Don't mention “Dive Into Python” in python*-roman package descriptions
+    (closes: #661555). Thanks to Konrad Schöbel for the bug report.
+  * Remove references to http://diveintopython.org/ from debian/copyright.
+  * Do not skip tests because of failed imports, as they should never happen.
+    (no-test-skipping.diff)
+  * Check only *.py files when looking for unguarded use of __file__.
+  * Fix paths in the auto-generated manual pages.
+  * Split section “Usage” into “Synopsis” and “Description” in the manual
+    pages.
+  * Fool DocutilsXMLTestCase into thinking that Python version is 2.7.3/3.2.3
+    when it's in fact 2.7.2/3.2.2 with patched
+    xml.dom.minidom.Document.toprettyxml() method (closes: #645369).
+    (fix-docutilsxmltestcase.diff).
+
+ -- Jakub Wilk <[e-mail]>  Sat, 03 Mar 2012 01:40:35 +0100
+
+python-docutils (0.8.1-5) unstable; urgency=low
+
+  [ Simon McVittie ]
+  * Remove myself from Uploaders
+
+  [ Jakub Wilk ]
+  * Backport upstream patch to follow the changes in the
+    xml.dom.minidom.Document.toprettyxml method
+    (fix-docutilsxmltestcase.diff).
+  * Drop postinst snippet to deal with a python-support bug (it cannot replace
+    directory with a regular file). It was needed only for 0.7 upgrades.
+  * Suggest fonts-linuxlibertine as an alternative to ttf-linux-libertine.
+  * Update David Goodger's e-mail address in debian/copyright
+    (closes: #653769). Thanks to Jari Aalto for the bug report.
+  * Update Subversion repository URLs in patch headers (so that they point to
+    SourceForge rather than BerliOS).
+  * Use xargs to iterate over all Python versions.
+  * Convert rst2odt_prepstyles manpage source from DocBook to
+    reStructuredText.
+    + Remove docbook-to-man from Build-Depends-Indep.
+    + Update debian/rules.
+  * Don't run dh_testroot in the clean target. There's a good chance that root
+    privileges are not needed (e.g. because binary target was run under
+    fakeroot), and even if they are actually needed, the target will fail
+    quickly.
+  * Drop obsolete virtual package: docutils-writer-manpage (closes: #631066).
+  * Run tests with --verbose.
+
+ -- Jakub Wilk <[e-mail]>  Wed, 15 Feb 2012 19:21:26 +0100
+
 python-docutils (0.8.1-4ubuntu1) precise; urgency=low
 
   * Build using dh_python2
@@ -9,7 +80,7 @@
 python-docutils (0.8.1-4) unstable; urgency=low
 
   * When running the test suite, don't copy stdout and stderr output to a log
-    file, as this would break under LC_ALL=C, PYTHONWARNING=d and python3.X
+    file, as this would break under LC_ALL=C, PYTHONWARNINGS=d and python3.X
     (testall-no-stdout-stderr-redirect.diff).
   * Use build/py2 and build/py3 for build directories.
   * Remove excessive whitespace from debian/control.

=== modified file 'debian/control'
--- debian/control	2011-12-17 14:11:08 +0000
+++ debian/control	2012-08-19 07:58:22 +0000
@@ -1,26 +1,24 @@
 Source: python-docutils
 Section: python
 Priority: optional
-Maintainer: Debian Python Modules Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Modules Team <[e-mail]>
 Uploaders: Jakub Wilk <[e-mail]>,
            martin f. krafft <[e-mail]>,
-           Simon McVittie <[e-mail]>,
            Michael Schutte <[e-mail]>,
            Ben Finney <[e-mail]>
 Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: python-all (>= 2.6.6-3~),
                      python3-all (>= 3.1.2-7~),
-                     docbook-to-man,
                      xml-core
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 X-Python-Version: >= 2.3
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-docutils/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-docutils/trunk/
 Homepage: http://docutils.sourceforge.net/
 
 Package: python-docutils
-Provides: docutils,
-          docutils-writer-manpage
+Provides: docutils
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
          python-roman,
@@ -30,7 +28,7 @@
             libpaper-utils,
             python-lxml,            
             docutils-doc (= ${source:Version})
-Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french, ttf-linux-libertine
+Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french, fonts-linuxlibertine | ttf-linux-libertine
 Conflicts: python-odtwriter,
            docutils-writer-odt
 Replaces: python-odtwriter,
@@ -61,7 +59,7 @@
 Conflicts: python-docutils (<< 0.7-3~),
            python-odtwriter,
            docutils-writer-odt
-Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french, docutils-doc, ttf-linux-libertine
+Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french, fonts-linuxlibertine | ttf-linux-libertine, docutils-doc
 Description: text processing system for reStructuredText (implemented in Python 3)
  reStructuredText is an easy-to-read, what-you-see-is-what-you-get plaintext
  markup syntax and parser system. It is useful for in-line program documentation
@@ -122,10 +120,6 @@
  from 1 to 4999 and understands the common shortcuts (IX == 9), but not
  illegal ones (MIM == 1999).
  .
- This module is part of "Dive Into Python", a free Python tutorial for
- experienced programmers.  Visit http://diveintopython.org/ for the
- latest version.
- .
  This package includes Python 2 modules.
 
 Package: python3-roman
@@ -136,8 +130,4 @@
  from 1 to 4999 and understands the common shortcuts (IX == 9), but not
  illegal ones (MIM == 1999).
  .
- This module is part of "Dive Into Python", a free Python tutorial for
- experienced programmers.  Visit http://diveintopython.org/ for the
- latest version.
- .
  This package includes Python 3 modules.

=== modified file 'debian/copyright'
--- debian/copyright	2011-09-03 01:32:29 +0000
+++ debian/copyright	2012-08-19 07:58:22 +0000
@@ -11,7 +11,7 @@
 
 It was downloaded from http://docutils.sourceforge.net/
 
-Upstream Author: David Goodger <[e-mail]>
+Upstream Author: David Goodger <[e-mail]>
 
 Most of the files included in this project have been placed in the public
 domain, and therefore have no license requirements and no restrictions on
@@ -146,8 +146,7 @@
   Copyright © 2001 Mark Pilgrim
 
   This program is part of "Dive Into Python", a free Python tutorial for
-  experienced programmers.  Visit http://diveintopython.org/ for the
-  latest version.
+  experienced programmers.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the Python 2.1.1 license, available at

=== modified file 'debian/docutils-common.install'
--- debian/docutils-common.install	2011-08-22 18:50:14 +0000
+++ debian/docutils-common.install	2012-08-19 07:58:22 +0000
@@ -1,4 +1,4 @@
 /usr/share/docutils/
 tools/editors/emacs/rst.el usr/share/emacs/site-lisp
 debian/50python-docutils.el etc/emacs/site-start.d
-docs/ref/docutils.dtd usr/share/xml/docutils/
+docs/ref/*.dtd usr/share/xml/docutils/

=== modified file 'debian/patches/add-missing-import.diff'
--- debian/patches/add-missing-import.diff	2011-10-23 22:59:02 +0000
+++ debian/patches/add-missing-import.diff	2012-08-19 07:58:22 +0000
@@ -1,6 +1,6 @@
 Description: Add missing import.
-Origin: upstream, http://svn.berlios.de/viewvc/docutils/trunk/docutils/docutils/frontend.py?r1=7071&r2=7196
-Last-Update: 2011-10-23
+Origin: upstream, http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/docutils/frontend.py?r1=7071&r2=7196
+Last-Update: 2011-12-31
 
 --- a/docutils/frontend.py
 +++ b/docutils/frontend.py

=== removed file 'debian/patches/disable-DocutilsXMLTestCase.diff'
--- debian/patches/disable-DocutilsXMLTestCase.diff	2011-12-17 14:11:08 +0000
+++ debian/patches/disable-DocutilsXMLTestCase.diff	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-Index: python-docutils-0.8.1/test/test_writers/test_docutils_xml.py
-===================================================================
---- python-docutils-0.8.1.orig/test/test_writers/test_docutils_xml.py	2009-04-01 20:00:21.000000000 +0000
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,85 +0,0 @@
--#!/usr/bin/env python
--
--# $Id: test_docutils_xml.py 5889 2009-04-01 20:00:21Z gbrandl $
--# Author: Lea Wiemann <[e-mail]>
--# Copyright: This module has been placed in the public domain.
--
--"""
--Test for docutils XML writer.
--"""
--
--from __init__ import DocutilsTestSupport
--
--import docutils
--import docutils.core
--from docutils._compat import b
--
--
--class DocutilsXMLTestCase(DocutilsTestSupport.StandardTestCase):
--
--    input = b("""\
--Test
--
------------
--
--Test. \xc3\xa4\xc3\xb6\xc3\xbc\xe2\x82\xac""")
--    xmldecl = b('<?xml version="1.0" encoding="iso-8859-1"?>\n')
--    doctypedecl = b('<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">\n')
--    generatedby = b('<!-- Generated by Docutils %s -->\n' % docutils.__version__)
--    bodynormal = b('<document source="&lt;string&gt;"><paragraph>Test</paragraph><transition/><paragraph>Test. \xe4\xf6\xfc&#8364;</paragraph></document>')
--    bodynewlines = b("""\
--<document source="&lt;string&gt;">
--<paragraph>
--Test
--</paragraph>
--<transition/>
--<paragraph>
--Test. \xe4\xf6\xfc&#8364;
--</paragraph>
--</document>
--""")
--    bodyindents = b("""\
--<document source="&lt;string&gt;">
--    <paragraph>
--        Test
--    </paragraph>
--    <transition/>
--    <paragraph>
--        Test. \xe4\xf6\xfc&#8364;
--    </paragraph>
--</document>
--""")
--
--    def test_publish(self):
--        settings = {'input_encoding': 'utf8',
--                    'output_encoding': 'iso-8859-1',
--                    '_disable_config': 1}
--        for settings['newlines'] in 0, 1:
--            for settings['indents'] in 0, 1:
--                for settings['xml_declaration'] in 0, 1:
--                    for settings['doctype_declaration'] in 0, 1:
--
--                        expected = b('')
--                        if settings['xml_declaration']:
--                            expected += self.xmldecl
--                        if settings['doctype_declaration']:
--                            expected += self.doctypedecl
--                        expected += self.generatedby
--                        if settings['indents']:
--                            expected += self.bodyindents
--                        elif settings['newlines']:
--                            expected += self.bodynewlines
--                        else:
--                            expected += self.bodynormal
--
--                        self.assertEqual(docutils.core.publish_string
--                                         (source=self.input,
--                                          reader_name='standalone',
--                                          writer_name='docutils_xml',
--                                          settings_overrides=settings),
--                                         expected)
--
--
--if __name__ == '__main__':
--    import unittest
--    unittest.main()

=== added file 'debian/patches/fix-docutilsxmltestcase-debian.diff'
--- debian/patches/fix-docutilsxmltestcase-debian.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-docutilsxmltestcase-debian.diff	2012-08-19 07:58:22 +0000
@@ -0,0 +1,26 @@
+Description: Forge sys.version_info for DocutilsXMLTestCase.
+ Fool DocutilsXMLTestCase into thinking that Python version is 2.7.3/3.2.3 when
+ it's in fact 2.7.2/3.2.2 with patched xml.dom.minidom.Document.toprettyxml()
+ method.
+Author: Jakub Wilk <[e-mail]>
+Bug-Debian: http://bugs.debian.org/645369
+Forwarded: not-needed
+Last-Update: 2012-03-03
+
+--- a/test/test_writers/test_docutils_xml.py
++++ b/test/test_writers/test_docutils_xml.py
+@@ -15,6 +15,14 @@
+ import docutils.core
+ from docutils._compat import b
+ 
++if sys.version_info[:3] in [(2, 7, 2), (3, 2, 2)]:
++    import xml.dom.minidom as minidom
++    if minidom.parseString('<x><y>z</y></x>').toprettyxml() == '<?xml version="1.0" ?>\n<x>\n\t<y>z</y>\n</x>\n':
++        sys_version_info = sys.version_info[:2] + (3, 'candidate', 0)
++        class sys:
++            version_info = sys_version_info
++        del sys_version_info
++    del minidom
+ 
+ class DocutilsXMLTestCase(DocutilsTestSupport.StandardTestCase):
+ 

=== added file 'debian/patches/fix-docutilsxmltestcase.diff'
--- debian/patches/fix-docutilsxmltestcase.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-docutilsxmltestcase.diff	2012-08-19 07:58:22 +0000
@@ -0,0 +1,62 @@
+Description: Follow the changes in xml.dom.minidom.Document.toprettyxml().
+ xml.dom.minidom.Document.toprettyxml() has change behaviour in Python 2.7.3
+ and 3.3.3. See http://bugs.python.org/issue4147 for details.
+ .
+ This patch updates DocutilsXMLTestCase to cope with these changes.
+Origin: backport, http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/test/test_writers/test_docutils_xml.py?r1=7221&r2=7226
+Bug: http://sourceforge.net/tracker/?func=detail&aid=3423983&group_id=38414&atid=422030
+Bug-Debian: http://bugs.debian.org/645369
+Last-Update: 2011-12-31
+
+--- a/test/test_writers/test_docutils_xml.py
++++ b/test/test_writers/test_docutils_xml.py
+@@ -10,6 +10,7 @@
+ 
+ from __init__ import DocutilsTestSupport
+ 
++import sys
+ import docutils
+ import docutils.core
+ from docutils._compat import b
+@@ -29,6 +30,13 @@
+     bodynormal = b('<document source="&lt;string&gt;"><paragraph>Test</paragraph><transition/><paragraph>Test. \xe4\xf6\xfc&#8364;</paragraph></document>')
+     bodynewlines = b("""\
+ <document source="&lt;string&gt;">
++<paragraph>Test</paragraph>
++<transition/>
++<paragraph>Test. \xe4\xf6\xfc&#8364;</paragraph>
++</document>
++""")
++    bodynewlines_old = b("""\
++<document source="&lt;string&gt;">
+ <paragraph>
+ Test
+ </paragraph>
+@@ -40,6 +48,13 @@
+ """)
+     bodyindents = b("""\
+ <document source="&lt;string&gt;">
++    <paragraph>Test</paragraph>
++    <transition/>
++    <paragraph>Test. \xe4\xf6\xfc&#8364;</paragraph>
++</document>
++""")
++    bodyindents_old = b("""\
++<document source="&lt;string&gt;">
+     <paragraph>
+         Test
+     </paragraph>
+@@ -79,6 +94,13 @@
+                                           settings_overrides=settings),
+                                          expected)
+ 
++    # New formatting introduced in versions 2.7.3 and 3.2.3 on 2011-11-18
++    # to fix http://bugs.python.org/issue4147
++    if (sys.version_info < (2, 7, 3) or
++        sys.version_info[0] == 3 and sys.version_info < (3, 2, 3)):
++        bodynewlines = bodynewlines_old
++        bodyindents = bodyindents_old
++
+ 
+ if __name__ == '__main__':
+     import unittest

=== modified file 'debian/patches/fix-error-reporting-encoding-issues.diff'
--- debian/patches/fix-error-reporting-encoding-issues.diff	2011-10-23 22:59:02 +0000
+++ debian/patches/fix-error-reporting-encoding-issues.diff	2012-08-19 07:58:22 +0000
@@ -1,6 +1,6 @@
 Description: Fix encoding issues in error reporting for Python 3.
-Origin: upstream, http://svn.berlios.de/viewvc/docutils/trunk/docutils/docutils/error_reporting.py?r1=7073&r2=7196
-Last-Update: 2011-10-23
+Origin: upstream, http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/docutils/error_reporting.py?r1=7073&r2=7196
+Last-Update: 2011-12-31
 
 --- a/docutils/error_reporting.py
 +++ b/docutils/error_reporting.py

=== modified file 'debian/patches/fix-io-encoding-issues.diff'
--- debian/patches/fix-io-encoding-issues.diff	2011-10-23 22:59:02 +0000
+++ debian/patches/fix-io-encoding-issues.diff	2012-08-19 07:58:22 +0000
@@ -1,7 +1,7 @@
 Description: Fix encoding issues in file I/O for Python 3.
 Bug: http://sourceforge.net/tracker/?func=detail&aid=3395948&group_id=38414&atid=422030
-Origin: upstream, http://svn.berlios.de/viewvc/docutils/trunk/docutils/docutils/io.py?r1=7073&r2=7196
-Last-Update: 2011-10-23
+Origin: upstream, http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/docutils/io.py?r1=7073&r2=7196
+Last-Update: 2011-12-31
 
 --- a/docutils/io.py
 +++ b/docutils/io.py

=== added file 'debian/patches/no-test-skipping.diff'
--- debian/patches/no-test-skipping.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/no-test-skipping.diff	2012-08-19 07:58:22 +0000
@@ -0,0 +1,17 @@
+Description: Do not skip tests.
+ If Build-Depends are satisfied, importing ElementTree should not fail. If it
+ does, it's better to fail than to skip the test silently.
+Author: Jakub Wilk <[e-mail]>
+Forwarded: not-needed
+Last-Update: 2012-03-02
+
+--- a/test/test_writers/test_odt.py
++++ b/test/test_writers/test_odt.py
+@@ -74,6 +74,7 @@
+                     from elementtree import ElementTree as etree
+                     WhichElementTree = 'elementtree'
+                 except ImportError, e:
++                    raise
+                     s1 = '\nSkipped test of odf_odt writer.  ' \
+                          'In order to test odf_odt writer ' \
+                          'must install either a version of Python containing ' \

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-12-17 14:11:08 +0000
+++ debian/patches/series	2012-08-19 07:58:22 +0000
@@ -9,5 +9,7 @@
 add-missing-import.diff
 fix-error-reporting-encoding-issues.diff
 fix-io-encoding-issues.diff
+fix-docutilsxmltestcase.diff
+fix-docutilsxmltestcase-debian.diff
+no-test-skipping.diff
 move-data-to-usr-share.diff
-disable-DocutilsXMLTestCase.diff

=== modified file 'debian/patches/testall-no-stdout-stderr-redirect.diff'
--- debian/patches/testall-no-stdout-stderr-redirect.diff	2011-10-23 22:59:02 +0000
+++ debian/patches/testall-no-stdout-stderr-redirect.diff	2012-08-19 07:58:22 +0000
@@ -1,6 +1,6 @@
 Description: Don't copy test suite output to a log.
  When running the test suite, don't copy stdout and stderr output to a log
- file, as this would break under LC_ALL=C, PYTHONWARNING=d and python3.X.
+ file, as this would break under LC_ALL=C, PYTHONWARNINGS=d and python3.X.
 Author: Jakub Wilk <[e-mail]>
 Forwarded: not-needed
 Last-Update: 2011-09-18

=== modified file 'debian/python-docutils.postinst'
--- debian/python-docutils.postinst	2011-06-28 20:43:04 +0000
+++ debian/python-docutils.postinst	2012-08-19 07:58:22 +0000
@@ -1,19 +1,6 @@
 #!/bin/sh
 set -e
 
-# python-support prior to 1.0.14 doesn't correctly handle replacing directory
-# with a regular file. The following snippet works around this bug:
-if [ "$1" = configure ]
-then
-	for pydir in /usr/lib/pymodules/python2.*/
-	do
-		if [ -d $pydir/docutils-0.7.egg-info/ ]
-		then
-			rm -rf $pydir/docutils-0.7.egg-info/
-		fi
-	done
-fi
-
 if [ "$1" = configure ]
 then
 	for exe in /usr/share/docutils/scripts/python2/*

=== removed file 'debian/rst2odt_prepstyles.sgml'
--- debian/rst2odt_prepstyles.sgml	2009-12-13 19:54:12 +0000
+++ debian/rst2odt_prepstyles.sgml	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.5//EN">
-<refentry id="rst2odt_prepstyles">
-  <refmeta>
-    <refentrytitle>rst2odt_prepstyles</refentrytitle>
-    <manvolnum>1</manvolnum>
-    <refmiscinfo class="date">July 2008</refmiscinfo>
-    <refmiscinfo class="source"></refmiscinfo>
-    <refmiscinfo class="title">odtwriter</refmiscinfo>
-  </refmeta>
-
-  <refnamediv>
-    <refname>rst2odt_prepstyles</refname>
-    <refpurpose>strip paper size specifications off of rst2odt stylesheets</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>rst2odt_prepstyles</command>
-      <arg choice="req"><replaceable>FILE</replaceable></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>
-      <command>rst2odt(1)</command> uses a stylesheet file as a template
-      for the ODT files it creates.  The stock
-      <filename>styles.odt</filename> file shipped with it comes without
-      page dimensions.  When <command>rst2odt</command> is run and
-      detects that there no paper size is given in the stylesheet, it is
-      automatically determined using <command>paperconf(1)</command>.
-    </para>
-
-    <para>
-      When editing stylesheets with OpenOffice.org Writer (or similar
-      programs), the resulting files always carry a page size.
-      <command>rst2odt</command> respects this setting and ensures that
-      documents processed with custom stylesheets look the same
-      regardless of the host it is running on.  If you want to get the
-      original behavior, i.e. a system-dependent paper size, you can run
-      <command>rst2odt_prepstyles</command> over your custom stylesheet.
-      Remember to re-run the command whenever you change the file with a
-      word processor.
-    </para>
-  </refsect1>
-
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>
-      odtwriter is Copyright &copy; 2006-2008 Dave Kuhlman
-      &lt;<email>[e-mail]</email>&gt;
-    </para>
-
-    <para>
-      This manual page was written by Michael Schutte for the Debian
-      GNU/Linux system (but may be used by others).
-    </para>
-  </refsect1>
-</refentry>
-<!-- vim: set sw=2 sts=2 et tw=72: -->

=== added file 'debian/rst2odt_prepstyles.txt'
--- debian/rst2odt_prepstyles.txt	1970-01-01 00:00:00 +0000
+++ debian/rst2odt_prepstyles.txt	2012-08-19 07:58:22 +0000
@@ -0,0 +1,38 @@
+==================
+rst2odt_prepstyles
+==================
+
+----------------------------------------------------------
+strip paper size specifications off of rst2odt stylesheets
+----------------------------------------------------------
+
+:Manual section: 1
+:Manual group: text processing
+
+Synopsis
+========
+**rst2odt_prepstyles** *FILE*
+
+Description
+===========
+
+**rst2odt**\(1) uses a stylesheet file as a template for the ODT files it
+creates.  The stock **styles.odt** file shipped with it comes without page
+dimensions.  When **rst2odt** is run and detects that there no paper size is
+given in the stylesheet, it is automatically determined using
+**paperconf**\(1).
+
+When editing stylesheets with OpenOffice.org Writer (or similar programs), the
+resulting files always carry a page size.  **rst2odt** respects this setting
+and ensures that documents processed with custom stylesheets look the same
+regardless of the host it is running on.  If you want to get the original
+behavior, i.e. a system-dependent paper size, you can run
+**rst2odt_prepstyles** over your custom stylesheet.  Remember to re-run the
+command whenever you change the file with a word processor.
+
+Author
+======
+odtwriter is Copyright © 2006-2008 Dave Kuhlman <[e-mail]>
+
+This manual page was written by Michael Schutte for the Debian GNU/Linux system
+(but may be used by others).

=== modified file 'debian/rules'
--- debian/rules	2011-12-17 14:11:08 +0000
+++ debian/rules	2012-08-19 07:58:22 +0000
@@ -20,11 +20,14 @@
 pre_strip_images2 = 's,<img alt="([^"]*)"[^>]*\bsrc="http://[^"]+"[^>]*>,$$1,g;'
 pre_strip_images = $(pre_strip_images1)$(pre_strip_images2)
 
+python_all = pyversions -r $(CURDIR)/debian/control | tr ' ' '\n' | xargs -t -I {} env {}
+python3_all = $(patsubst py%,py3%,$(python_all))
+
 build build-indep: build-stamp
 build-stamp:
 	dh_testdir
 	# Check if move-data-to-usr-share.diff is up-to-date
-	if grep -r __file__ docutils/ | grep -vw _datadir; then \
+	if grep -r __file__ --include='*.py' docutils/ | grep -vw _datadir; then \
 		echo "Error: Some uses of __file__ are not guarded by _datadir()." \
 			"Is move-data-to-usr-share.diff up-to-date?"; \
 		exit 1; \
@@ -35,15 +38,9 @@
 	python3 setup.py build --build-lib=build/py3/
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 	# Run test suite for Python 2.X:
-	set -ex && cd build/py2/ && \
-	for python in $(shell pyversions -r); do \
-		$$python ../../test/alltests.py; \
-	done
+	cd build/py2/ && $(python_all) ../../test/alltests.py --verbose
 	# Run test suite for Python 3.X:
-	set -ex && cd build/py3/ && \
-	for python in $(shell py3versions -r); do \
-		$$python test/alltests.py; \
-	done
+	cd build/py3/ && $(python3_all) test/alltests.py --verbose
 endif
 	# Build documentation:
 	PYTHONPATH=.:extras python tools/buildhtml.py \
@@ -58,7 +55,6 @@
 
 clean:
 	dh_testdir
-	dh_testroot
 	rm -f build-stamp
 	rm -rf build/
 	find -name '*.py[co]' -delete
@@ -104,13 +100,20 @@
 		PYTHONPATH=.:extras; \
 		export PYTHONPATH; \
 		cp debian/$$exe.txt debian/tmp/man/$$exe.txt; \
-		python debian/tmp/usr/share/docutils/scripts/python2/$$exe --help \
+		python debian/tmp/usr/share/docutils/scripts/python2/$$exe --help | \
+			sed \
+				-e '1 s/^Usage$$/Synopsis/' \
+				-e 's/^=/====/' \
+				-e '3 s/^  //' \
+				-e '4 a Description' \
+				-e '4 a ===========' \
 			>> debian/tmp/man/$$exe.txt;\
 		python tools/rst2man.py debian/tmp/man/$$exe.txt \
 			debian/tmp/man/$$exe.1; \
 	done
-	docbook-to-man debian/rst2odt_prepstyles.sgml > \
+	PYTHONPATH=.:extras python tools/rst2man.py debian/rst2odt_prepstyles.txt \
 		debian/tmp/man/rst2odt_prepstyles.1
+	sed -i -e 's,"\(docutils/writers/\),"/usr/share/\1,g' debian/tmp/man/*
 
 # Build architecture-independent files here.
 binary-indep: build install

=== added file 'test/test_writers/test_docutils_xml.py'
--- test/test_writers/test_docutils_xml.py	1970-01-01 00:00:00 +0000
+++ test/test_writers/test_docutils_xml.py	2012-08-19 07:58:22 +0000
@@ -0,0 +1,115 @@
+#!/usr/bin/env python
+
+# $Id: test_docutils_xml.py 5889 2009-04-01 20:00:21Z gbrandl $
+# Author: Lea Wiemann <[e-mail]>
+# Copyright: This module has been placed in the public domain.
+
+"""
+Test for docutils XML writer.
+"""
+
+from __init__ import DocutilsTestSupport
+
+import sys
+import docutils
+import docutils.core
+from docutils._compat import b
+
+if sys.version_info[:3] in [(2, 7, 2), (3, 2, 2)]:
+    import xml.dom.minidom as minidom
+    if minidom.parseString('<x><y>z</y></x>').toprettyxml() == '<?xml version="1.0" ?>\n<x>\n\t<y>z</y>\n</x>\n':
+        sys_version_info = sys.version_info[:2] + (3, 'candidate', 0)
+        class sys:
+            version_info = sys_version_info
+        del sys_version_info
+    del minidom
+
+class DocutilsXMLTestCase(DocutilsTestSupport.StandardTestCase):
+
+    input = b("""\
+Test
+
+----------
+
+Test. \xc3\xa4\xc3\xb6\xc3\xbc\xe2\x82\xac""")
+    xmldecl = b('<?xml version="1.0" encoding="iso-8859-1"?>\n')
+    doctypedecl = b('<!DOCTYPE document PUBLIC "+//IDN docutils.sourceforge.net//DTD Docutils Generic//EN//XML" "http://docutils.sourceforge.net/docs/ref/docutils.dtd">\n')
+    generatedby = b('<!-- Generated by Docutils %s -->\n' % docutils.__version__)
+    bodynormal = b('<document source="&lt;string&gt;"><paragraph>Test</paragraph><transition/><paragraph>Test. \xe4\xf6\xfc&#8364;</paragraph></document>')
+    bodynewlines = b("""\
+<document source="&lt;string&gt;">
+<paragraph>Test</paragraph>
+<transition/>
+<paragraph>Test. \xe4\xf6\xfc&#8364;</paragraph>
+</document>
+""")
+    bodynewlines_old = b("""\
+<document source="&lt;string&gt;">
+<paragraph>
+Test
+</paragraph>
+<transition/>
+<paragraph>
+Test. \xe4\xf6\xfc&#8364;
+</paragraph>
+</document>
+""")
+    bodyindents = b("""\
+<document source="&lt;string&gt;">
+    <paragraph>Test</paragraph>
+    <transition/>
+    <paragraph>Test. \xe4\xf6\xfc&#8364;</paragraph>
+</document>
+""")
+    bodyindents_old = b("""\
+<document source="&lt;string&gt;">
+    <paragraph>
+        Test
+    </paragraph>
+    <transition/>
+    <paragraph>
+        Test. \xe4\xf6\xfc&#8364;
+    </paragraph>
+</document>
+""")
+
+    def test_publish(self):
+        settings = {'input_encoding': 'utf8',
+                    'output_encoding': 'iso-8859-1',
+                    '_disable_config': 1}
+        for settings['newlines'] in 0, 1:
+            for settings['indents'] in 0, 1:
+                for settings['xml_declaration'] in 0, 1:
+                    for settings['doctype_declaration'] in 0, 1:
+
+                        expected = b('')
+                        if settings['xml_declaration']:
+                            expected += self.xmldecl
+                        if settings['doctype_declaration']:
+                            expected += self.doctypedecl
+                        expected += self.generatedby
+                        if settings['indents']:
+                            expected += self.bodyindents
+                        elif settings['newlines']:
+                            expected += self.bodynewlines
+                        else:
+                            expected += self.bodynormal
+
+                        self.assertEqual(docutils.core.publish_string
+                                         (source=self.input,
+                                          reader_name='standalone',
+                                          writer_name='docutils_xml',
+                                          settings_overrides=settings),
+                                         expected)
+
+    # New formatting introduced in versions 2.7.3 and 3.2.3 on 2011-11-18
+    # to fix http://bugs.python.org/issue4147
+    if (sys.version_info < (2, 7, 3) or
+        sys.version_info[0] == 3 and sys.version_info < (3, 2, 3)):
+        bodynewlines = bodynewlines_old
+        bodyindents = bodyindents_old
+
+
+if __name__ == '__main__':
+    import unittest
+    unittest.main()

=== modified file 'test/test_writers/test_odt.py'
--- test/test_writers/test_odt.py	2011-08-22 18:50:14 +0000
+++ test/test_writers/test_odt.py	2012-08-19 07:58:22 +0000
@@ -74,6 +74,7 @@
                     from elementtree import ElementTree as etree
                     WhichElementTree = 'elementtree'
                 except ImportError, e:
+                    raise
                     s1 = '\nSkipped test of odf_odt writer.  ' \
                          'In order to test odf_odt writer ' \
                          'must install either a version of Python containing ' \