~ubuntu-branches/ubuntu/trusty/python-docutils/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/no-local-roman.diff

  • Committer: Package Import Robot
  • Author(s): Michael Schutte, Jakub Wilk, Michael Schutte, Dmitry Shachnev
  • Date: 2013-08-05 16:47:43 UTC
  • mfrom: (11.1.9 experimental)
  • Revision ID: package-import@ubuntu.com-20130805164743-00lyz2imgs85ttwz
Tags: 0.11-1
[ Jakub Wilk ]
* Remove martin f. krafft and Ben Finney from Uploaders at their requests.

[ Michael Schutte ]
* New upstream release 0.11, closes: #712284, #714880.
  - Drop patch math-output-html.diff: Fixed upstream.
  - Drop patch fix-buildhtml-progress.diff: Applied upstream.
  - Drop patch strict-csv-parser.diff: Fixed upstream.
  - Drop patch unknown-url-exc-use-repr.diff: Applied upstream.
  - Update patch move-data-to-usr-share.diff: Default stylesheet paths for
    writers/html4css1 have changed.
  - Refresh the remaining patches.
  - New patch no-local-roman.diff: Use the roman module from python-roman
    instead of the copy shipped with docutils.
  - Update information about upstream version control in debian/copyright.
* Change my e-mail host in Uploaders and debian/copyright to @debian.org.
* New patch rst2odt_prepstyles-elementtree.diff: Port the rst2odt_prepstyles
  utility to ElementTree.  Drop Recommends: python-lxml.  Closes: #714319.
* New patch odt-writer-ascii-filenames.diff: Only use ASCII for filenames of
  images embedded in ODT files, closes: #714317.

[ Dmitry Shachnev ]
* Use dh_python2 instead of deprecated dh_pysupport.
* Add XS-Testsuite header, and replace XS-Python-Version with preferred
  X-Python-Version (closes: #685509).
* Add myself to Uploaders.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Description: Use the "roman" module from python-roman instead of the local copy.
 
2
Author: Michael Schutte <michi@debian.org>
 
3
Forwarded: not-needed
 
4
Last-Update: 2013-07-22
 
5
 
 
6
--- a/docutils/parsers/rst/states.py
 
7
+++ b/docutils/parsers/rst/states.py
 
8
@@ -116,7 +116,8 @@
 
9
 from docutils.parsers.rst import directives, languages, tableparser, roles
 
10
 from docutils.parsers.rst.languages import en as _fallback_language_module
 
11
 from docutils.utils import escape2null, unescape, column_width
 
12
-from docutils.utils import punctuation_chars, roman, urischemes
 
13
+from docutils.utils import punctuation_chars, urischemes
 
14
+import roman
 
15
 
 
16
 class MarkupError(DataError): pass
 
17
 class UnknownInterpretedRoleError(DataError): pass