[Python-modules-commits] r33433 - in packages/python-docutils/trunk/debian (3 files)

[mitya57 at users.alioth.debian.org]

    Date: Tuesday, July 21, 2015 @ 18:35:44
  Author: mitya57
Revision: 33433

Do not mention build-time locale in rst2html manpage
(static-help-message.diff; closes: #791587).

Added:
  packages/python-docutils/trunk/debian/patches/static-help-message.diff
Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/patches/series

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2015-07-21 16:55:58 UTC (rev 33432)
+++ packages/python-docutils/trunk/debian/changelog	2015-07-21 18:35:44 UTC (rev 33433)
@@ -1,3 +1,10 @@
+python-docutils (0.12+dfsg-2) UNRELEASED; urgency=medium
+
+  * Do not mention build-time locale in rst2html manpage
+    (static-help-message.diff; closes: #791587).
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 21 Jul 2015 21:24:41 +0300
+
 python-docutils (0.12+dfsg-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series	2015-07-21 16:55:58 UTC (rev 33432)
+++ packages/python-docutils/trunk/debian/patches/series	2015-07-21 18:35:44 UTC (rev 33433)
@@ -10,3 +10,4 @@
 no-local-roman.diff
 rst2odt_prepstyles-elementtree.diff
 odt-writer-ascii-filenames.diff
+static-help-message.diff

Added: packages/python-docutils/trunk/debian/patches/static-help-message.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/static-help-message.diff	                        (rev 0)
+++ packages/python-docutils/trunk/debian/patches/static-help-message.diff	2015-07-21 18:35:44 UTC (rev 33433)
@@ -0,0 +1,21 @@
+Description: 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.
+Bug: https://bugs.debian.org/791587
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: no
+Last-Update: 2015-07-21
+
+--- a/docutils/frontend.py
++++ b/docutils/frontend.py
+@@ -482,8 +482,8 @@
+           ['--output-encoding-error-handler'],
+           {'default': 'strict', 'validator': validate_encoding_error_handler}),
+          ('Specify text encoding and error handler for error output.  '
+-          'Default: %s:%s.'
+-          % (default_error_encoding, default_error_encoding_error_handler),
++          'Default text encoding: system encoding. Default error handler: %s.'
++          % default_error_encoding_error_handler,
+           ['--error-encoding', '-e'],
+           {'metavar': '<name[:handler]>', 'default': default_error_encoding,
+            'validator': validate_encoding_and_error_handler}),