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

« back to all changes in this revision

Viewing changes to debian/patches/move-data-to-usr-share.diff

  • Committer: Package Import Robot
  • Author(s): Dmitry Shachnev
  • Date: 2013-05-17 16:47:30 UTC
  • mfrom: (20.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20130517164730-5ux7p59z0jdku6pf
Tags: 0.10-3ubuntu1
* Merge with Debian unstable, remaining changes:
  - Use dh_python2 instead of dh_pysupport.
  - Backport patch to support embedded aliases in references
    (support-aliases-in-references.diff).
* disable_py33_failing_tests.diff: dropped, the issue is now
  properly fixed in Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
61
61
                                   r'\usepackage{mathptmx} % Times',
62
62
--- a/docutils/writers/odf_odt/__init__.py
63
63
+++ b/docutils/writers/odf_odt/__init__.py
64
 
@@ -395,13 +395,13 @@
 
64
@@ -399,13 +399,13 @@
65
65
 
66
66
     default_stylesheet_path = utils.relative_path(
67
67
         os.path.join(os.getcwd(), 'dummy'),