Commit e69f3125 authored by Dmitry Shachnev's avatar Dmitry Shachnev 🐧

Update patches for the new release.

parent 93f5ed32
......@@ -2,6 +2,8 @@ python-docutils (0.14+dfsg-1) UNRELEASED; urgency=medium
* New upstream release.
* Update debian/watch to properly mangle upstream pre-releases.
* Drop get_column_widths-compatibility.diff, applied upstream.
* Refresh and rebase other patches.
-- Dmitry Shachnev <mitya57@debian.org> Tue, 19 Sep 2017 00:17:27 +0300
......
From 03baf7716ddfceb839d714cae7dfad360c1aaee8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Thu, 8 Oct 2015 11:57:03 -0700
Subject: change paths in documentation to match Debian's
Change paths in documentation to match Debian's. Debian policy recommends not
having extensions like .py on script names, and buildhtml seems too generic a
name.
Forwarded: not-needed
Last-Update: 2016-12-10
Change paths in documentation to match Debian's. Debian policy recommends not
having extensions like .py on script names, and buildhtml seems too generic a
name.
Patch-Name: doc-debian-paths.diff
Forwarded: not-needed
Last-Update: 2017-09-19
---
README.txt | 21 +++++++++++++++++++--
docs/user/tools.txt | 43 ++++++++++++++++++++++++++++++++++++-------
2 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/README.txt b/README.txt
index 854fe34..a5ea488 100644
index 33ee605..3e9abda 100644
--- a/README.txt
+++ b/README.txt
@@ -11,8 +11,19 @@
......@@ -41,7 +39,7 @@ index 854fe34..a5ea488 100644
This is for those who want to get up & running quickly.
@@ -283,6 +294,12 @@ with STDIN and STDOUT being the defaults. Use the "--help" option to
@@ -281,6 +292,12 @@ with STDIN and STDOUT being the defaults. Use the "--help" option to
the front-end tools for details on options and arguments. See
Docutils Front-End Tools (``docs/user/tools.txt``) for full documentation.
......@@ -55,7 +53,7 @@ index 854fe34..a5ea488 100644
``docutils.statemachine`` module is usable independently. It contains
extensive inline documentation (in reStructuredText format of course).
diff --git a/docs/user/tools.txt b/docs/user/tools.txt
index e95cf36..c90d6a9 100644
index 9f06816..665dc80 100644
--- a/docs/user/tools.txt
+++ b/docs/user/tools.txt
@@ -39,6 +39,10 @@ one argument (source) is specified, the standard output (stdout) is
......@@ -101,7 +99,7 @@ index e95cf36..c90d6a9 100644
+In Debian this front end is installed as rst2html4.
+
The ``rst2html.py`` front end reads standalone reStructuredText source
The ``rst2html4.py`` front end reads standalone reStructuredText source
files and produces `XHTML 1.0 Transitional`_ output.
A CSS stylesheet is required for proper rendering; a simple but
@@ -130,13 +140,13 @@ below).
......
From f57c0b8bab0243949d98848ab55433e1a1380314 Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@debian.org>
Date: Thu, 8 Oct 2015 11:57:04 -0700
Subject: =?UTF-8?q?Use=20=E2=80=98sensible-browser=E2=80=99=20to=20preview?=
=?UTF-8?q?=20S5=20slides.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: Use "sensible-browser" to preview slides
Use 'sensible-browser' (rather than 'firefox', which does not exist in Debian)
as a program to preview S5 slides.
Use ‘sensible-browser’ (rather than ‘firefox’, which does not exist in Debian)
as a program to preview S5 slides.
Forwarded: not-needed
Last-Update: 2011-08-21
Patch-Name: emacs-sensible-browser.diff
---
tools/editors/emacs/rst.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
index de75af7..58af00d 100644
index c5ef7a0..0d83971 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
@@ -4425,7 +4425,7 @@ buffer, if the region is not selected."
@@ -4457,7 +4457,7 @@ buffer, if the region is not selected."
;; FIXME: Should be integrated in `rst-compile-toolsets' defaulting to
;; something like `browse-url'.
......
From a2af4ee3e032e26da1e478a4e807213ff15a48ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Milde?= <milde@users.sf.net>
Date: Tue, 3 Jan 2017 16:14:00 +0000
Subject: improve backwards compatibility of patch 120
Patch 120 (tables accept option widths: list of relative widths, auto or
grid) changed the API in parsers.rst.directives.tables
This patch lets get_column_widths() return one result again.
Origin: upstream, https://sourceforge.net/p/docutils/code/8010/
Bug: https://bugs.debian.org/851739
Patch-Name: get_column_widths-compatibility.diff
---
docutils/parsers/rst/directives/tables.py | 29 ++++++++++++-----------------
docutils/parsers/rst/states.py | 6 ++++--
2 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/docutils/parsers/rst/directives/tables.py b/docutils/parsers/rst/directives/tables.py
index 0e890b6..5904c3e 100644
--- a/docutils/parsers/rst/directives/tables.py
+++ b/docutils/parsers/rst/directives/tables.py
@@ -112,13 +112,7 @@ class Table(Directive):
'No table data detected in CSV file.', nodes.literal_block(
self.block_text, self.block_text), line=self.lineno)
raise SystemMessagePropagation(error)
- if self.widths == 'auto':
- widths = 'auto'
- elif self.widths: # "grid" or list of integers
- widths = 'given'
- else:
- widths = self.widths
- return widths, col_widths
+ return col_widths
def extend_short_rows_with_empty_cells(self, columns, parts):
for part in parts:
@@ -253,7 +247,7 @@ class CSVTable(Table):
self.check_table_dimensions(rows, header_rows, stub_columns)
table_head.extend(rows[:header_rows])
table_body = rows[header_rows:]
- widths, col_widths = self.get_column_widths(max_cols)
+ col_widths = self.get_column_widths(max_cols)
self.extend_short_rows_with_empty_cells(max_cols,
(table_head, table_body))
except SystemMessagePropagation, detail:
@@ -269,7 +263,7 @@ class CSVTable(Table):
return [error]
table = (col_widths, table_head, table_body)
table_node = self.state.build_table(table, self.content_offset,
- stub_columns, widths=widths)
+ stub_columns, widths=self.widths)
table_node['classes'] += self.options.get('class', [])
if 'align' in self.options:
table_node['align'] = self.options.get('align')
@@ -413,7 +407,7 @@ class ListTable(Table):
node = nodes.Element() # anonymous container for parsing
self.state.nested_parse(self.content, self.content_offset, node)
try:
- num_cols, widths, col_widths = self.check_list_content(node)
+ num_cols, col_widths = self.check_list_content(node)
table_data = [[item.children for item in row_list[0]]
for row_list in node[0]]
header_rows = self.options.get('header-rows', 0)
@@ -421,7 +415,7 @@ class ListTable(Table):
self.check_table_dimensions(table_data, header_rows, stub_columns)
except SystemMessagePropagation, detail:
return [detail.args[0]]
- table_node = self.build_table_from_list(table_data, widths, col_widths,
+ table_node = self.build_table_from_list(table_data, col_widths,
header_rows, stub_columns)
if 'align' in self.options:
table_node['align'] = self.options.get('align')
@@ -467,14 +461,15 @@ class ListTable(Table):
raise SystemMessagePropagation(error)
else:
num_cols = len(item[0])
- widths, col_widths = self.get_column_widths(num_cols)
- return num_cols, widths, col_widths
+ col_widths = self.get_column_widths(num_cols)
+ return num_cols, col_widths
- def build_table_from_list(self, table_data, widths, col_widths, header_rows,
- stub_columns):
+ def build_table_from_list(self, table_data, col_widths, header_rows, stub_columns):
table = nodes.table()
- if widths:
- table['classes'] += ['colwidths-%s' % widths]
+ if self.widths == 'auto':
+ table['classes'] += ['colwidths-auto']
+ elif self.widths: # "grid" or list of integers
+ table['classes'] += ['colwidths-given']
tgroup = nodes.tgroup(cols=len(col_widths))
table += tgroup
for col_width in col_widths:
diff --git a/docutils/parsers/rst/states.py b/docutils/parsers/rst/states.py
index bc6ac95..c5cc424 100644
--- a/docutils/parsers/rst/states.py
+++ b/docutils/parsers/rst/states.py
@@ -1768,8 +1768,10 @@ class Body(RSTState):
def build_table(self, tabledata, tableline, stub_columns=0, widths=None):
colwidths, headrows, bodyrows = tabledata
table = nodes.table()
- if widths:
- table['classes'] += ['colwidths-%s' % widths]
+ if widths == 'auto':
+ table['classes'] += ['colwidths-auto']
+ elif widths: # "grid" or list of integers
+ table['classes'] += ['colwidths-given']
tgroup = nodes.tgroup(cols=len(colwidths))
table += tgroup
for colwidth in colwidths:
From c58ad329a22548cc9361ab16bfb3ba2362cf166d Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@debian.org>
Date: Thu, 8 Oct 2015 11:57:02 -0700
Subject: Update license information for IE PNG Alpha Fix.
Upstream author of IE PNG Alpha Fix agreed that every version of his script
can be distributed under the terms of the LGPL 2.1 or later version.
Upstream author of IE PNG Alpha Fix agreed that every version of his script
can be distributed under the terms of the LGPL 2.1 or later version.
Bug: http://sourceforge.net/p/docutils/bugs/169/
Bug-Debian: http://bugs.debian.org/563696
Forwarded: no
Last-Update: 2011-03-02
Patch-Name: iepngfix-license.diff
---
docutils/writers/s5_html/themes/default/iepngfix.htc | 2 +-
test/functional/expected/ui/default/iepngfix.htc | 2 +-
......
From 8f74d791e9e384cf6fb8102e3782a0fe1a564068 Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@debian.org>
Date: Thu, 8 Oct 2015 11:57:09 -0700
Subject: Allow all data files to be moved to /usr/share/docutils/.
Forwarded: not-needed
Last-Update: 2016-12-10
Patch-Name: move-data-to-usr-share.diff
---
docutils/__init__.py | 15 +++++++++++++++
docutils/parsers/rst/directives/misc.py | 3 ++-
......@@ -20,10 +17,10 @@ Patch-Name: move-data-to-usr-share.diff
9 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/docutils/__init__.py b/docutils/__init__.py
index 79ed8fb..883ec13 100644
index f4a81e3..d2900a2 100644
--- a/docutils/__init__.py
+++ b/docutils/__init__.py
@@ -215,3 +215,18 @@ class Component(SettingsSpec, TransformSpec):
@@ -260,3 +260,18 @@ class Component(SettingsSpec, TransformSpec):
a certain input context or output format.
"""
return format in self.supported
......@@ -64,7 +61,7 @@ index f843bdc..c734ced 100644
def run(self):
diff --git a/docutils/writers/html4css1/__init__.py b/docutils/writers/html4css1/__init__.py
index 7853496..fe5b493 100644
index 567eec8..6826e6e 100644
--- a/docutils/writers/html4css1/__init__.py
+++ b/docutils/writers/html4css1/__init__.py
@@ -27,15 +27,16 @@ class Writer(writers._html_base.Writer):
......@@ -89,10 +86,10 @@ index 7853496..fe5b493 100644
settings_spec = (
'HTML-Specific Options',
diff --git a/docutils/writers/html5_polyglot/__init__.py b/docutils/writers/html5_polyglot/__init__.py
index c14c5ee..056705c 100644
index 9835447..32045b0 100644
--- a/docutils/writers/html5_polyglot/__init__.py
+++ b/docutils/writers/html5_polyglot/__init__.py
@@ -40,11 +40,11 @@ class Writer(writers._html_base.Writer):
@@ -39,11 +39,11 @@ class Writer(writers._html_base.Writer):
"""Formats this writer supports."""
default_stylesheets = ['minimal.css','plain.css']
......@@ -107,7 +104,7 @@ index c14c5ee..056705c 100644
settings_spec = (
'HTML-Specific Options',
diff --git a/docutils/writers/latex2e/__init__.py b/docutils/writers/latex2e/__init__.py
index 112bc76..f16d757 100644
index b9720d2..8b32ff1 100644
--- a/docutils/writers/latex2e/__init__.py
+++ b/docutils/writers/latex2e/__init__.py
@@ -23,6 +23,7 @@ try:
......@@ -128,10 +125,10 @@ index 112bc76..f16d757 100644
r'\usepackage{mathptmx} % Times',
r'\usepackage[scaled=.90]{helvet}',
diff --git a/docutils/writers/odf_odt/__init__.py b/docutils/writers/odf_odt/__init__.py
index 3b29e3b..90a2f0b 100644
index efe7967..2813279 100644
--- a/docutils/writers/odf_odt/__init__.py
+++ b/docutils/writers/odf_odt/__init__.py
@@ -399,13 +399,13 @@ class Writer(writers.Writer):
@@ -405,13 +405,13 @@ class Writer(writers.Writer):
default_stylesheet_path = utils.relative_path(
os.path.join(os.getcwd(), 'dummy'),
......
From 91133c0a4a5bfd1002365be7cc321be145918f08 Mon Sep 17 00:00:00 2001
From: Michael Schutte <michi@debian.org>
Date: Thu, 8 Oct 2015 11:57:10 -0700
Subject: Use the "roman" module from python-roman instead of the local copy.
Forwarded: not-needed
Last-Update: 2013-07-22
Patch-Name: no-local-roman.diff
Last-Update: 2017-09-19
---
docutils/parsers/rst/states.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/docutils/parsers/rst/states.py b/docutils/parsers/rst/states.py
index 35de9d2..bc6ac95 100644
index fa4c507..c590afa 100644
--- a/docutils/parsers/rst/states.py
+++ b/docutils/parsers/rst/states.py
@@ -116,7 +116,8 @@ import docutils.parsers.rst
@@ -116,8 +116,9 @@ import docutils.parsers.rst
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
from docutils.utils import split_escaped_whitespace
+import roman
class MarkupError(DataError): pass
......
From d73a8df714b946e2d211b1ec553369fd8437ee18 Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@debian.org>
Date: Thu, 8 Oct 2015 11:57:06 -0700
Subject: 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.
If Build-Depends are satisfied, importing ElementTree should not fail. If it
does, it's better to fail than to skip the test silently.
Forwarded: not-needed
Last-Update: 2012-03-02
Patch-Name: no-test-skipping.diff
---
test/test_writers/test_odt.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/test_writers/test_odt.py b/test/test_writers/test_odt.py
index 845f465..b781558 100755
index bda1f72..3b626db 100755
--- a/test/test_writers/test_odt.py
+++ b/test/test_writers/test_odt.py
@@ -72,6 +72,7 @@ class DocutilsOdtTestCase(DocutilsTestSupport.StandardTestCase):
......
From 71f36957f858eefd3d1fa158397e794dc608365e Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@debian.org>
Date: Thu, 8 Oct 2015 11:57:07 -0700
Subject: run 2to3 in parallel
Forwarded: not-needed
Last-Update: 2012-05-12
Patch-Name: parallel-2to3.diff
---
setup.py | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/setup.py b/setup.py
index 97ec659..118bec1 100755
index 3bd6225..9ea0926 100755
--- a/setup.py
+++ b/setup.py
@@ -24,6 +24,18 @@ except ImportError:
......
From 794825ccfebc1181ea3b682f8c4b4d0600de556c Mon Sep 17 00:00:00 2001
From: Michael Schutte <michi@debian.org>
Date: Thu, 8 Oct 2015 11:57:11 -0700
Subject: Port rst2odt_prepstyles to ElementTree
rst2odt_prepstyles uses lxml to parse, modify and write XML.
Use ElementTree, which is shipped with Python >= 2.5, in place of lxml.
rst2odt_prepstyles uses lxml to parse, modify and write XML.
Use ElementTree, which is shipped with Python >= 2.5, in place of lxml.
Bug-Debian: http://bugs.debian.org/714319
Forwarded: https://sourceforge.net/p/docutils/patches/114/
Last-Update: 2013-08-06
Patch-Name: rst2odt_prepstyles-elementtree.diff
---
tools/rst2odt_prepstyles.py | 34 ++++++++++++++++++++++++++--------
1 file changed, 26 insertions(+), 8 deletions(-)
......
......@@ -9,4 +9,3 @@ move-data-to-usr-share.diff
no-local-roman.diff
rst2odt_prepstyles-elementtree.diff
static-help-message.diff
get_column_widths-compatibility.diff
From 8f0658957a05bcf614cb86f73750ef63a8e85a93 Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@debian.org>
Date: Thu, 8 Oct 2015 11:57:13 -0700
Subject: make the help message not depend on runtime encoding
This message goes into manpage, and we do not want the manpage to misleadingly
mention build-time locale there.
This message goes into manpage, and we do not want the manpage to misleadingly
mention build-time locale there.
Bug: https://bugs.debian.org/791587
Forwarded: no
Last-Update: 2015-07-21
Patch-Name: static-help-message.diff
---
docutils/frontend.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docutils/frontend.py b/docutils/frontend.py
index f837c62..dca26ea 100644
index 1aeae5c..a538e2e 100644
--- a/docutils/frontend.py
+++ b/docutils/frontend.py
@@ -482,8 +482,8 @@ class OptionParser(optparse.OptionParser, docutils.SettingsSpec):
@@ -518,8 +518,8 @@ class OptionParser(optparse.OptionParser, docutils.SettingsSpec):
['--output-encoding-error-handler'],
{'default': 'strict', 'validator': validate_encoding_error_handler}),
('Specify text encoding and error handler for error output. '
......
From 56f365a66ddad7d03bc851532ea79ad81096b1a6 Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@debian.org>
Date: Thu, 8 Oct 2015 11:57:08 -0700
Subject: fix sys.path for tests
Fix sys.path in the test support module so that is matches paths that are in
the Debian package.
Fix sys.path in the test support module so that is matches paths that are in
the Debian package.
Forwarded: not-needed
Last-Update: 2013-05-16
Patch-Name: test-sys-path.diff
---
test/DocutilsTestSupport.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
......
From d7b94e20ae2dc39942c1bc9eaf70ae21b090d370 Mon Sep 17 00:00:00 2001
From: Jakub Wilk <jwilk@debian.org>
Date: Thu, 8 Oct 2015 11:57:05 -0700
Subject: 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, PYTHONWARNINGS=d and python3.X.
When running the test suite, don't copy stdout and stderr output to a log
file, as this would break under LC_ALL=C, PYTHONWARNINGS=d and python3.X.
Forwarded: not-needed
Last-Update: 2011-09-18
Patch-Name: testall-no-stdout-stderr-redirect.diff
---
test/alltests.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/test/alltests.py b/test/alltests.py
index 28f98f6..a7cf6f1 100755
index 4a9b50f..5ce5862 100755
--- a/test/alltests.py
+++ b/test/alltests.py
@@ -69,9 +69,6 @@ def suite():
@@ -70,9 +70,6 @@ def suite():
sys.stdout.flush()
return suite
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment