Merge lp:~mitya57/ubuntu/saucy/python-docutils/fix-autopkgtest-failures into lp:ubuntu/saucy-proposed/python-docutils

[Dmitry Shachnev]

The previous upload didn't migrate to release pocket because of autopkgtest failures, this branch should fix that.

python-docutils (0.11-1svn1) saucy; urgency=low

  * Upload the current Subversion HEAD to fix autopkgtest failures.

  [ Michael Schutte ]
  * Document in the patch header that #714313 is also taken care of by
    odt-writer-ascii-filenames.diff.

  [ Dmitry Shachnev ]
  * Updated rst2odt_prepstyles-elementtree.diff to make it not cause
    SyntaxErrors with Python 3.
  * Fix autopkgtest failures:
    - Copy HISTORY.txt to the testing directory.
    - Disable test_html4css1_misc as it does not work with our location
      of html4css1.css.

 -- Dmitry Shachnev <email address hidden> Wed, 07 Aug 2013 19:44:34 +0400

[Daniel Holbach (dholbach)]

Thanks a lot. Uploaded!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-08-05 16:47:43 +0000
+++ debian/changelog	2013-08-07 15:53:27 +0000
@@ -1,3 +1,21 @@
+python-docutils (0.11-1svn1) saucy; urgency=low
+
+  * Upload the current Subversion HEAD to fix autopkgtest failures.
+
+  [ Michael Schutte ]
+  * Document in the patch header that #714313 is also taken care of by
+    odt-writer-ascii-filenames.diff.
+
+  [ Dmitry Shachnev ]
+  * Updated rst2odt_prepstyles-elementtree.diff to make it not cause
+    SyntaxErrors with Python 3.
+  * Fix autopkgtest failures:
+    - Copy HISTORY.txt to the testing directory.
+    - Disable test_html4css1_misc as it does not work with our location
+      of html4css1.css.
+
+ -- Dmitry Shachnev <[e-mail]>  Wed, 07 Aug 2013 19:44:34 +0400
+
 python-docutils (0.11-1) experimental; urgency=low
 
   [ Jakub Wilk ]

=== modified file 'debian/patches/odt-writer-ascii-filenames.diff'
--- debian/patches/odt-writer-ascii-filenames.diff	2013-08-05 16:47:43 +0000
+++ debian/patches/odt-writer-ascii-filenames.diff	2013-08-07 15:53:27 +0000
@@ -5,9 +5,10 @@
  ASCII (dropping non-representable characters) to be on the safe side.
  This patch also removes an invalid assumption about the encoding
  used internally by the interpreter, which has caused Debian bug
- #714317.
+ #714317, and fixes #714313.
 Author: Michael Schutte <[e-mail]>
 Bug-Debian: http://bugs.debian.org/714317
+Bug-Debian: http://bugs.debian.org/714313
 Forwarded: https://sourceforge.net/p/docutils/patches/113/
 Last-Update: 2013-08-05
 

=== modified file 'debian/patches/rst2odt_prepstyles-elementtree.diff'
--- debian/patches/rst2odt_prepstyles-elementtree.diff	2013-08-05 16:47:43 +0000
+++ debian/patches/rst2odt_prepstyles-elementtree.diff	2013-08-07 15:53:27 +0000
@@ -4,7 +4,7 @@
 Bug-Debian: http://bugs.debian.org/714319
 Author: Michael Schutte <[e-mail]>
 Forwarded: https://sourceforge.net/p/docutils/patches/114/
-Last-Update: 2013-08-05
+Last-Update: 2013-08-06
 
 --- a/tools/rst2odt_prepstyles.py
 +++ b/tools/rst2odt_prepstyles.py
@@ -15,10 +15,10 @@
 -from lxml import etree
 +try:
 +    from xml.etree import ElementTree as etree
-+except ImportError, e:
++except ImportError:
 +    try:
 +        from elementtree import ElementTree as etree
-+    except ImportError, e:
++    except ImportError:
 +        raise ImportError('Missing an implementation of ElementTree. ' \
 +                'Please install either Python >= 2.5 or ElementTree.')
 +

=== modified file 'debian/tests/python-docutils'
--- debian/tests/python-docutils	2012-11-09 11:35:37 +0000
+++ debian/tests/python-docutils	2013-08-07 15:53:27 +0000
@@ -1,7 +1,8 @@
 #!/bin/sh
 set -e -u
-cp -r docs/ test/ "$ADTTMP"
+cp -r HISTORY.txt docs/ test/ "$ADTTMP"
 cd "$ADTTMP/test/"
+rm test_writers/test_html4css1_misc.py
 pyversions -i \
 | tr ' ' '\n' \
 | xargs -I {} env PYTHONWARNINGS=d PYTHONHASHSEED=random {} \

=== modified file 'debian/tests/python3-docutils'
--- debian/tests/python3-docutils	2012-11-09 11:35:37 +0000
+++ debian/tests/python3-docutils	2013-08-07 15:53:27 +0000
@@ -1,7 +1,8 @@
 #!/bin/sh
 set -e -u
-cp -r docs/ test/ "$ADTTMP"
+cp -r HISTORY.txt docs/ test/ "$ADTTMP"
 cd "$ADTTMP/test/"
+rm test_writers/test_html4css1_misc.py
 2to3-$(py3versions -vd) --no-diffs -j $(nproc) -w . 2>&1
 py3versions -i \
 | tr ' ' '\n' \