[Python-modules-commits] r25357 - in packages/python-docutils/trunk/debian (12 files)
michi at users.alioth.debian.org
michi at users.alioth.debian.org
Sat Aug 3 17:23:37 UTC 2013
Date: Saturday, August 3, 2013 @ 17:23:34
Author: michi
Revision: 25357
python-docutils: Start packaging 0.11
Added:
packages/python-docutils/trunk/debian/patches/no-local-roman.diff
Modified:
packages/python-docutils/trunk/debian/changelog
packages/python-docutils/trunk/debian/control
packages/python-docutils/trunk/debian/copyright
packages/python-docutils/trunk/debian/patches/doc-debian-paths.diff
packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff
packages/python-docutils/trunk/debian/patches/python3-pil-no-bytestrings.diff
packages/python-docutils/trunk/debian/patches/series
Deleted:
packages/python-docutils/trunk/debian/patches/fix-buildhtml-progress.diff
packages/python-docutils/trunk/debian/patches/math-output-html.diff
packages/python-docutils/trunk/debian/patches/strict-csv-parser.diff
packages/python-docutils/trunk/debian/patches/unknown-url-exc-use-repr.diff
Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog 2013-08-03 14:16:14 UTC (rev 25356)
+++ packages/python-docutils/trunk/debian/changelog 2013-08-03 17:23:34 UTC (rev 25357)
@@ -1,9 +1,24 @@
-python-docutils (0.10-4) UNRELEASED; urgency=low
+python-docutils (0.11-1) UNRELEASED; urgency=low
+ [ Jakub Wilk ]
* Remove martin f. krafft and Ben Finney from Uploaders at their requests.
- -- Jakub Wilk <jwilk at debian.org> Fri, 28 Jun 2013 10:55:41 +0200
+ [ 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.
+ -- Michael Schutte <michi at debian.org> Mon, 29 Jul 2013 09:56:32 +0200
+
python-docutils (0.10-3) unstable; urgency=low
[ Dmitry Shachnev ]
Modified: packages/python-docutils/trunk/debian/control
===================================================================
--- packages/python-docutils/trunk/debian/control 2013-08-03 14:16:14 UTC (rev 25356)
+++ packages/python-docutils/trunk/debian/control 2013-08-03 17:23:34 UTC (rev 25357)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Jakub Wilk <jwilk at debian.org>,
- Michael Schutte <michi at uiae.at>
+ Michael Schutte <michi at debian.org>
Build-Depends: debhelper (>= 7)
Build-Depends-Indep: python-all (>= 2.4),
python3-all (>= 3.1.2-7~),
Modified: packages/python-docutils/trunk/debian/copyright
===================================================================
--- packages/python-docutils/trunk/debian/copyright 2013-08-03 14:16:14 UTC (rev 25356)
+++ packages/python-docutils/trunk/debian/copyright 2013-08-03 17:23:34 UTC (rev 25357)
@@ -5,7 +5,7 @@
- Jakub Wilk <jwilk at debian.org>,
- martin f. krafft <madduck at debian.org>,
- Simon McVittie <smcv at debian.org>,
-- Michael Schutte <michi at uiae.at>,
+- Michael Schutte <michi at debian.org>,
- Ben Finney <ben+debian at benfinney.id.au> and
- the Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>.
@@ -30,9 +30,9 @@
The primary repository for the Work is the Internet World Wide Web
site <http://docutils.sourceforge.net/>. The Work consists of the
files within the "docutils" module of the Docutils project Subversion
-repository (Internet host docutils.svn.sourceforge.net, filesystem path
-/svnroot/docutils), whose Internet web interface is located at
-<http://docutils.svn.sourceforge.net/viewvc/docutils/>. Files dedicated to the
+repository (Internet host svn.code.sf.net, filesystem path
+/p/docutils), whose Internet web interface is located at
+<http://sourceforge.net/p/docutils/code/>. Files dedicated to the
public domain may be identified by the inclusion, near the beginning
of each file, of a declaration of the form::
Modified: packages/python-docutils/trunk/debian/patches/doc-debian-paths.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/doc-debian-paths.diff 2013-08-03 14:16:14 UTC (rev 25356)
+++ packages/python-docutils/trunk/debian/patches/doc-debian-paths.diff 2013-08-03 17:23:34 UTC (rev 25357)
@@ -178,8 +178,8 @@
+
The ``rst2xml.py`` front end produces Docutils-native XML output.
This can be transformed with standard XML tools such as XSLT
- processors into arbitrary final forms.
-@@ -314,6 +330,8 @@
+ processors into arbitrary final forms. An example is the xml2rst_ processor
+@@ -317,6 +333,8 @@
:Parser: reStructuredText
:Writer: ODF/.odt
@@ -188,7 +188,7 @@
The ``rst2odt.py`` front end reads standalone reStructuredText
source files and produces ODF/.odt files that can be read, edited,
printed, etc with OpenOffice ``oowriter``
-@@ -337,6 +355,8 @@
+@@ -347,6 +365,8 @@
:Parser: reStructuredText
:Writer: Pseudo-XML
@@ -197,7 +197,7 @@
``rst2pseudoxml.py`` is used for debugging the Docutils "Reader to
Transform to Writer" pipeline. It produces a compact pretty-printed
"pseudo-XML", where nesting is indicated by indentation (no end-tags).
-@@ -351,6 +371,9 @@
+@@ -361,6 +381,9 @@
:Parser: reStructuredText
:Writer: N/A
Deleted: packages/python-docutils/trunk/debian/patches/fix-buildhtml-progress.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/fix-buildhtml-progress.diff 2013-08-03 14:16:14 UTC (rev 25356)
+++ packages/python-docutils/trunk/debian/patches/fix-buildhtml-progress.diff 2013-08-03 17:23:34 UTC (rev 25357)
@@ -1,17 +0,0 @@
-Description: ensure that rst-buildhtml progress messages end with newlines
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: yes
-Bug: http://sourceforge.net/p/docutils/bugs/216/
-Last-Update: 2013-05-16
-
---- a/tools/buildhtml.py
-+++ b/tools/buildhtml.py
-@@ -206,7 +206,7 @@
- del subdirectories[:]
- return
- if not self.initial_settings.silent:
-- errout.write('/// Processing directory: %s' % directory)
-+ errout.write('/// Processing directory: %s\n' % directory)
- sys.stderr.flush()
- # settings.ignore grows many duplicate entries as we recurse
- # if we add patterns in config files or on the command line.
Deleted: packages/python-docutils/trunk/debian/patches/math-output-html.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/math-output-html.diff 2013-08-03 14:16:14 UTC (rev 25356)
+++ packages/python-docutils/trunk/debian/patches/math-output-html.diff 2013-08-03 17:23:34 UTC (rev 25357)
@@ -1,97 +0,0 @@
-Description: change default math output format to HTML
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: not-needed
-Bug-Debian: http://bugs.debian.org/677929
-Last-Update: 2013-05-16
-
---- a/docs/user/config.txt
-+++ b/docs/user/config.txt
-@@ -814,6 +814,14 @@
- The format of mathematical content (`math directive`_ and role) in
- the output document. Supported values are (case insensitive):
-
-+ :HTML:
-+ Format math in standard HTML enhanced by CSS rules
-+
-+ Requires the ``math.css`` stylesheet (stored in the same
-+ installation-dependent directory as the `default stylesheet`__).
-+
-+ .. __: `stylesheet_path [html4css1 writer]`_
-+
- :MathJax:
- Format math for display with MathJax_, a JavaScript-based math
- rendering engine that uses HTML/CSS, JavaScript, and unicode
-@@ -840,14 +848,6 @@
-
- Downloads JavaScript code from a third-party site.
-
-- :HTML:
-- Format math in standard HTML enhanced by CSS rules
--
-- Requires the ``math.css`` stylesheet (stored in the same
-- installation-dependent directory as the `default stylesheet`__).
--
-- .. __: `stylesheet_path [html4css1 writer]`_
--
- :MathML:
- Embed math content as presentational MathML_.
-
-@@ -870,7 +870,7 @@
-
- The failsave fallback.
-
-- Default: MathJax Option: ``--math-output``.
-+ Default: HTML Option: ``--math-output``.
-
- New in Docutils 0.8.
-
---- a/docutils/writers/html4css1/__init__.py
-+++ b/docutils/writers/html4css1/__init__.py
-@@ -135,9 +135,9 @@
- ['--table-style'],
- {'default': ''}),
- ('Math output format, one of "MathML", "HTML", "MathJax" '
-- 'or "LaTeX". Default: "MathJax"',
-+ 'or "LaTeX". Default: "HTML"',
- ['--math-output'],
-- {'default': 'MathJax'}),
-+ {'default': 'HTML'}),
- ('Omit the XML declaration. Use with caution.',
- ['--no-xml-declaration'],
- {'dest': 'xml_declaration', 'default': 1, 'action': 'store_false',
---- a/test/functional/expected/standalone_rst_html4css1.html
-+++ b/test/functional/expected/standalone_rst_html4css1.html
-@@ -12,7 +12,6 @@
- <meta name="copyright" content="This document has been placed in the public domain. You may do with it as you wish. You may copy, modify, redistribute, reattribute, sell, buy, rent, lease, destroy, or improve it, quote it at length, excerpt, incorporate, collate, fold, staple, or mutilate it, or do anything else to it that your or anyone else's heart desires." />
- <meta content="reStructuredText, test, parser" name="keywords" />
- <meta content="A test document, containing at least one example of each reStructuredText construct." lang="en" name="description" />
--<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
- <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" />
- </head>
- <body>
-@@ -862,7 +861,7 @@
- or as base for special code roles, e.g. the LaTeX code in the next
- paragraph.</p>
- <p>Docutils uses LaTeX syntax for math directives and roles:
--<code class="tex">\alpha = f(x)</code> prints <span class="math">\(\alpha = f(x)\)</span>
-+<code class="tex">\alpha = f(x)</code> prints <span class="formula"><i>α</i> = <i>f</i>(<i>x</i>)</span>
- .</p>
- <p>The <tt class="docutils literal">:code:</tt> option of the <cite>include</cite> directive sets the included content
- as a code block, here the rst file <tt class="docutils literal">header_footer.txt</tt> with line numbers:</p>
---- a/test/test_writers/test_html4css1_misc.py
-+++ b/test/test_writers/test_html4css1_misc.py
-@@ -44,11 +44,11 @@
- data = ':math:`42`'
-
- def test_math_output_default(self):
-- # Currently MathJax with default URL. Likely to change to HTML!
-+ # HTML
- mysettings = self.settings_overrides
- head = core.publish_parts(self.data, writer_name='html4css1',
-- settings_overrides=mysettings)['head']
-- self.assertIn(self.mathjax_script % self.default_mathjax_url, head)
-+ settings_overrides=mysettings)['head']
-+ self.assertNotIn('MathJax.js', head)
-
- def test_math_output_mathjax(self):
- # Explicitly specifying math_output=MathJax, case insensitively
Modified: packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff 2013-08-03 14:16:14 UTC (rev 25356)
+++ packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff 2013-08-03 17:23:34 UTC (rev 25357)
@@ -1,7 +1,7 @@
Description: Allow all data files to be moved to /usr/share/docutils/.
Author: Jakub Wilk <jwilk at debian.org>
Forwarded: not-needed
-Last-Update 2011-06-05
+Last-Update: 2013-07-22
--- a/docutils/parsers/rst/directives/misc.py
+++ b/docutils/parsers/rst/directives/misc.py
@@ -24,12 +24,12 @@
def run(self):
--- a/docutils/writers/html4css1/__init__.py
+++ b/docutils/writers/html4css1/__init__.py
-@@ -47,13 +47,13 @@
+@@ -44,13 +44,13 @@
- default_stylesheet_path = utils.relative_path(
- os.path.join(os.getcwd(), 'dummy'),
-- os.path.join(os.path.dirname(__file__), default_stylesheet))
-+ os.path.join(docutils._datadir(__file__), default_stylesheet))
+ default_stylesheet = 'html4css1.css'
+ default_stylesheet_dirs = ['.', utils.relative_path(
+- os.path.join(os.getcwd(), 'dummy'), os.path.dirname(__file__))]
++ os.path.join(os.getcwd(), 'dummy'), docutils._datadir(__file__))]
default_template = 'template.txt'
Added: packages/python-docutils/trunk/debian/patches/no-local-roman.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/no-local-roman.diff (rev 0)
+++ packages/python-docutils/trunk/debian/patches/no-local-roman.diff 2013-08-03 17:23:34 UTC (rev 25357)
@@ -0,0 +1,17 @@
+Description: Use the "roman" module from python-roman instead of the local copy.
+Author: Michael Schutte <michi at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-07-22
+
+--- a/docutils/parsers/rst/states.py
++++ b/docutils/parsers/rst/states.py
+@@ -116,7 +116,8 @@
+ from docutils.parsers.rst import directives, languages, tableparser, roles
+ from docutils.parsers.rst.languages import en as _fallback_language_module
+ from docutils.utils import escape2null, unescape, column_width
+-from docutils.utils import punctuation_chars, roman, urischemes
++from docutils.utils import punctuation_chars, urischemes
++import roman
+
+ class MarkupError(DataError): pass
+ class UnknownInterpretedRoleError(DataError): pass
Modified: packages/python-docutils/trunk/debian/patches/python3-pil-no-bytestrings.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/python3-pil-no-bytestrings.diff 2013-08-03 14:16:14 UTC (rev 25356)
+++ packages/python-docutils/trunk/debian/patches/python3-pil-no-bytestrings.diff 2013-08-03 17:23:34 UTC (rev 25357)
@@ -26,7 +26,7 @@
else:
--- a/docutils/writers/html4css1/__init__.py
+++ b/docutils/writers/html4css1/__init__.py
-@@ -1032,8 +1032,11 @@
+@@ -1039,8 +1039,11 @@
and self.settings.file_insertion_enabled):
imagepath = urllib.url2pathname(uri)
try:
Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series 2013-08-03 14:16:14 UTC (rev 25356)
+++ packages/python-docutils/trunk/debian/patches/series 2013-08-03 17:23:34 UTC (rev 25357)
@@ -1,9 +1,5 @@
-strict-csv-parser.diff
python3-pil-no-bytestrings.diff
python3.3-odt-writer.diff
-unknown-url-exc-use-repr.diff
-math-output-html.diff
-fix-buildhtml-progress.diff
iepngfix-license.diff
doc-debian-paths.diff
emacs-sensible-browser.diff
@@ -12,3 +8,4 @@
parallel-2to3.diff
test-sys-path.diff
move-data-to-usr-share.diff
+no-local-roman.diff
Deleted: packages/python-docutils/trunk/debian/patches/strict-csv-parser.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/strict-csv-parser.diff 2013-08-03 14:16:14 UTC (rev 25356)
+++ packages/python-docutils/trunk/debian/patches/strict-csv-parser.diff 2013-08-03 17:23:34 UTC (rev 25357)
@@ -1,73 +0,0 @@
-Description: make the CSV parser stricter
- Make the CSV parser stricter. Update the tests so that they take into that
- CSV syntax error message may vary with Python version.
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: yes
-Bug: http://sourceforge.net/p/docutils/bugs/210/
-Bug-Debian: http://bugs.debian.org/692286
-Last-Update: 2013-05-16
-
---- a/docutils/parsers/rst/directives/tables.py
-+++ b/docutils/parsers/rst/directives/tables.py
-@@ -166,6 +166,7 @@
- skipinitialspace = True
- lineterminator = '\n'
- quoting = csv.QUOTE_MINIMAL
-+ strict = True
-
- def __init__(self, options):
- if 'delim' in options:
-@@ -191,6 +192,7 @@
- skipinitialspace = True
- lineterminator = '\n'
- quoting = csv.QUOTE_MINIMAL
-+ strict = True
-
- def check_requirements(self):
- pass
---- a/test/test_parsers/test_rst/test_directives/test_tables.py
-+++ b/test/test_parsers/test_rst/test_directives/test_tables.py
-@@ -42,6 +42,12 @@
-
- null_bytes_exception = DocutilsTestSupport.exception_data(null_bytes)[0]
-
-+def unexpected_eod():
-+ reader = csv.reader(['"\n'], strict=1)
-+ reader.next()
-+
-+unexpected_eod_exception = DocutilsTestSupport.exception_data(unexpected_eod)[0]
-+
- totest = {}
-
- totest['table'] = [
-@@ -760,12 +766,12 @@
- <system_message level="3" line="1" source="test data" type="ERROR">
- <paragraph>
- Error with CSV data in "csv-table" directive:
-- newline inside string
-+ %s
- <literal_block xml:space="preserve">
- .. csv-table:: bad CSV data
- \n\
- "bad", \"csv, data
--"""],
-+""" % unexpected_eod_exception],
- ["""\
- .. csv-table:: bad CSV header data
- :header: "bad", \"csv, data
-@@ -777,13 +783,13 @@
- <system_message level="3" line="1" source="test data" type="ERROR">
- <paragraph>
- Error with CSV data in "csv-table" directive:
-- newline inside string
-+ %s
- <literal_block xml:space="preserve">
- .. csv-table:: bad CSV header data
- :header: "bad", \"csv, data
- \n\
- good, csv, data
--"""],
-+""" % unexpected_eod_exception],
- ["""\
- .. csv-table:: bad encoding
- :file: %s
Deleted: packages/python-docutils/trunk/debian/patches/unknown-url-exc-use-repr.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/unknown-url-exc-use-repr.diff 2013-08-03 14:16:14 UTC (rev 25356)
+++ packages/python-docutils/trunk/debian/patches/unknown-url-exc-use-repr.diff 2013-08-03 17:23:34 UTC (rev 25357)
@@ -1,41 +0,0 @@
-Description: expect that urllib.requests in Python ≥ 3.3.2 use repr() when reporting unknown URLs
-Bug: http://sourceforge.net/p/docutils/bugs/235/
-Bug-Debian: http://bugs.debian.org/708565
-Origin: upstream, http://sourceforge.net/p/docutils/code/7663/
-Last-Update: 2013-05-16
-
---- a/test/test_parsers/test_rst/test_directives/test_tables.py
-+++ b/test/test_parsers/test_rst/test_directives/test_tables.py
-@@ -12,6 +12,7 @@
-
- import os
- import csv
-+import sys
- from docutils.parsers.rst.directives import tables
-
-
-@@ -32,6 +33,10 @@
- else:
- unichr_exception_string = str(unichr_exception)
-
-+csv_unknown_url = "'bogus.csv'"
-+if sys.version_info < (3,3,2):
-+ csv_unknown_url = "bogus.csv"
-+
- def null_bytes():
- import csv
- csv_data = open(utf_16_csv, 'rb').read()
-@@ -578,11 +583,11 @@
- <system_message level="4" line="1" source="test data" type="SEVERE">
- <paragraph>
- Problems with "csv-table" directive URL "bogus.csv":
-- unknown url type: bogus.csv.
-+ unknown url type: %s.
- <literal_block xml:space="preserve">
- .. csv-table:: bad URL
- :url: bogus.csv
--"""],
-+""" % csv_unknown_url],
- ["""\
- .. csv-table:: column mismatch
- :widths: 10,20
More information about the Python-modules-commits
mailing list