[Python-modules-commits] r13842 - in packages/python-docutils/trunk/debian (7 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Wed Jul 7 18:33:40 UTC 2010
Date: Wednesday, July 7, 2010 @ 18:33:27
Author: jwilk
Revision: 13842
New upstream release.
Modified:
packages/python-docutils/trunk/debian/changelog
packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.diff
packages/python-docutils/trunk/debian/patches/13_install_roman.diff
packages/python-docutils/trunk/debian/patches/14_use_setuptools.diff
packages/python-docutils/trunk/debian/patches/series
Deleted:
packages/python-docutils/trunk/debian/patches/alltest-exitcode.diff
packages/python-docutils/trunk/debian/patches/decode-path-none.diff
Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog 2010-07-07 18:18:20 UTC (rev 13841)
+++ packages/python-docutils/trunk/debian/changelog 2010-07-07 18:33:27 UTC (rev 13842)
@@ -1,3 +1,11 @@
+python-docutils (0.7-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ + Drop decode-path-none.diff, alltest-exitcode.diff, applied upstream.
+ + Refresh other patches.
+
+ -- Jakub Wilk <jwilk at debian.org> Wed, 07 Jul 2010 19:39:18 +0200
+
python-docutils (0.6-5) unstable; urgency=low
* Correct the preinst script to remove python-central leftovers even when
Modified: packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.diff 2010-07-07 18:18:20 UTC (rev 13841)
+++ packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.diff 2010-07-07 18:33:27 UTC (rev 13842)
@@ -10,8 +10,6 @@
docs/user/tools.txt | 37 ++++++++++++++++++++++++++++++-------
3 files changed, 52 insertions(+), 9 deletions(-)
-diff --git a/README.txt b/README.txt
-index 29be7b0..93ee3c9 100644
--- a/README.txt
+++ b/README.txt
@@ -11,8 +11,19 @@
@@ -36,7 +34,7 @@
This is for those who want to get up & running quickly. Read on for
complete details.
-@@ -255,6 +266,12 @@ with STDIN and STDOUT being the defaults. Use the "--help" option to
+@@ -283,6 +294,12 @@
the front-end tools for details on options and arguments. See
Docutils Front-End Tools (``docs/user/tools.txt``) for full documentation.
@@ -49,11 +47,9 @@
The package modules are continually growing and evolving. The
``docutils.statemachine`` module is usable independently. It contains
extensive inline documentation (in reStructuredText format of course).
-diff --git a/docs/user/emacs.txt b/docs/user/emacs.txt
-index c61d781..d257ac4 100644
--- a/docs/user/emacs.txt
+++ b/docs/user/emacs.txt
-@@ -99,6 +99,9 @@ adjust a section title::
+@@ -120,6 +120,9 @@
(add-hook 'rst-adjust-hook 'rst-toc-update)
@@ -63,11 +59,9 @@
Additional configuration variables can be customized and can be found
by browsing the source code for ``rst.el``.
-diff --git a/docs/user/tools.txt b/docs/user/tools.txt
-index 912d0bd..e0af6bb 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
+@@ -39,6 +39,10 @@
used for the destination. If no arguments are specified, the standard
input (stdin) is used for the source as well.
@@ -78,7 +72,7 @@
Getting Help
============
-@@ -66,13 +70,15 @@ buildhtml.py
+@@ -66,13 +70,15 @@
:Parser: reStructuredText
:Writers: HTML, PEP/HTML
@@ -95,7 +89,7 @@
After unpacking the Docutils package, the following shell commands
will generate HTML for all included documentation::
-@@ -103,6 +109,8 @@ rst2html.py
+@@ -103,6 +109,8 @@
:Parser: reStructuredText
:Writer: HTML
@@ -104,7 +98,7 @@
The ``rst2html.py`` front end reads standalone reStructuredText source
files and produces HTML 4 (XHTML 1) output compatible with modern
browsers that support cascading stylesheets (CSS). A stylesheet is
-@@ -112,13 +120,13 @@ installed and used by default (see Stylesheets_ below).
+@@ -112,13 +120,13 @@
For example, to process a reStructuredText file "``test.txt``" into
HTML::
@@ -120,7 +114,7 @@
Stylesheets
-@@ -146,6 +154,8 @@ rstpep2html.py
+@@ -146,6 +154,8 @@
:Parser: reStructuredText
:Writer: PEP/HTML
@@ -129,7 +123,7 @@
``rstpep2html.py`` reads a new-style PEP (marked up with
reStructuredText) and produces HTML. It requires a template file and
a stylesheet. By default, it makes use of a "``pep-html-template``"
-@@ -156,7 +166,7 @@ by command-line options or configuration files.
+@@ -156,7 +166,7 @@
For example, to process a PEP into HTML::
cd <path-to-docutils>/docs/peps
@@ -138,7 +132,7 @@
rst2s5.py
-@@ -166,6 +176,8 @@ rst2s5.py
+@@ -166,6 +176,8 @@
:Parser: reStructuredText
:Writer: S5/HTML
@@ -147,7 +141,7 @@
The ``rst2s5.py`` front end reads standalone reStructuredText source
files and produces (X)HTML output compatible with S5_, the "Simple
Standards-based Slide Show System" by Eric Meyer. A theme is required
-@@ -175,7 +187,7 @@ are available; see Themes_ below.
+@@ -175,7 +187,7 @@
For example, to process a reStructuredText file "``slides.txt``" into
S5/HTML::
@@ -156,7 +150,7 @@
Now open the "``slides.html``" file in your favorite browser, switch
to full-screen mode, and enjoy the results.
-@@ -193,7 +205,7 @@ using the "``--theme``" option (for themes that come with Docutils) or
+@@ -193,7 +205,7 @@
the "``--theme-url``" option (for themes anywhere). For example, the
"medium-black" theme can be specified as follows::
@@ -165,7 +159,7 @@
The theme will be copied to the ``ui/medium-black`` directory.
-@@ -276,11 +288,13 @@ rst2latex.py
+@@ -276,11 +288,13 @@
:Parser: reStructuredText
:Writer: LaTeX2e
@@ -179,8 +173,8 @@
+ rst2latex test.txt test.tex
The output file "``test.tex``" should then be processed with ``latex``
- or ``pdflatex`` to get a typeset document.
-@@ -306,6 +320,8 @@ rst2xml.py
+ or ``pdflatex`` to get a document in DVI, PostScript or PDF format for
+@@ -299,6 +313,8 @@
:Parser: reStructuredText
:Writer: XML (Docutils native)
@@ -189,7 +183,7 @@
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.
-@@ -321,6 +337,8 @@ rst2odt.py
+@@ -314,6 +330,8 @@
:Parser: reStructuredText
:Writer: ODF/.odt
@@ -198,7 +192,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``
-@@ -344,6 +362,8 @@ rst2pseudoxml.py
+@@ -337,6 +355,8 @@
:Parser: reStructuredText
:Writer: Pseudo-XML
@@ -207,7 +201,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).
-@@ -358,6 +378,9 @@ quicktest.py
+@@ -351,6 +371,9 @@
:Parser: reStructuredText
:Writer: N/A
@@ -217,4 +211,3 @@
The ``quicktest.py`` tool is used for testing the reStructuredText
parser. It does not use a Docutils Reader or Writer or the standard
Docutils command-line options. Rather, it does its own I/O and calls
---
Modified: packages/python-docutils/trunk/debian/patches/13_install_roman.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/13_install_roman.diff 2010-07-07 18:18:20 UTC (rev 13841)
+++ packages/python-docutils/trunk/debian/patches/13_install_roman.diff 2010-07-07 18:33:27 UTC (rev 13842)
@@ -14,11 +14,9 @@
setup.py | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
-diff --git a/setup.py b/setup.py
-index 14f98af..d2ba0d5 100755
--- a/setup.py
+++ b/setup.py
-@@ -180,6 +180,11 @@ extra_modules = [('roman', '1.4', ['toRoman', 'fromRoman',
+@@ -210,6 +210,11 @@
List of (module name, minimum __version__ string, [attribute names])."""
def get_extras():
@@ -30,4 +28,3 @@
extras = []
for module_name, version, attributes in extra_modules:
try:
---
Modified: packages/python-docutils/trunk/debian/patches/14_use_setuptools.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/14_use_setuptools.diff 2010-07-07 18:18:20 UTC (rev 13841)
+++ packages/python-docutils/trunk/debian/patches/14_use_setuptools.diff 2010-07-07 18:33:27 UTC (rev 13842)
@@ -7,11 +7,9 @@
setup.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/setup.py b/setup.py
-index d2ba0d5..27d239b 100755
--- a/setup.py
+++ b/setup.py
-@@ -6,7 +6,7 @@ import sys
+@@ -6,7 +6,7 @@
import os
import glob
try:
@@ -19,5 +17,4 @@
+ from setuptools import setup, Command
from distutils.command.build import build
from distutils.command.build_py import build_py
- from distutils.command.install_data import install_data
---
+ if sys.version_info >= (3,):
Deleted: packages/python-docutils/trunk/debian/patches/alltest-exitcode.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/alltest-exitcode.diff 2010-07-07 18:18:20 UTC (rev 13841)
+++ packages/python-docutils/trunk/debian/patches/alltest-exitcode.diff 2010-07-07 18:33:27 UTC (rev 13842)
@@ -1,16 +0,0 @@
-Description: Make test suite runner exit with code 0 if all test passes.
-Origin: upstream, http://svn.berlios.de/viewcvs/docutils/trunk/docutils/test/alltests.py?r1=6116&r2=6296
-Last-Update: 2010-03-31
-
---- a/test/alltests.py
-+++ b/test/alltests.py
-@@ -83,4 +83,8 @@
- # print >>sys.stderr, pformat(suite) # check the test suite
- finish = time.time()
- print 'Elapsed time: %.3f seconds' % (finish - start)
-- sys.exit(result)
-+ if result.errors or result.failures:
-+ # return test result object to enable processing in programmatic use
-+ sys.exit(result)
-+ else: # no problems, exit with zero
-+ sys.exit()
Deleted: packages/python-docutils/trunk/debian/patches/decode-path-none.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/decode-path-none.diff 2010-07-07 18:18:20 UTC (rev 13841)
+++ packages/python-docutils/trunk/debian/patches/decode-path-none.diff 2010-07-07 18:33:27 UTC (rev 13842)
@@ -1,20 +0,0 @@
-Description: Fix the docutils.utils.decode_path() function so that it accepts
- None as an argument.
-Origin: http://svn.berlios.de/viewcvs/docutils?view=rev&revision=6216
-Bug: http://sourceforge.net/tracker/?func=detail&aid=2923723&group_id=38414&atid=422030
-Bug-Debian: http://bugs.debian.org/563087
-Last-Update: 2010-01-08
-
-Index: python-docutils-0.6/docutils/utils.py
-===================================================================
---- python-docutils-0.6.orig/docutils/utils.py 2009-09-10 13:02:27.000000000 +0200
-+++ python-docutils-0.6/docutils/utils.py 2010-01-08 11:40:23.000000000 +0100
-@@ -338,6 +338,8 @@
- # see also http://article.gmane.org/gmane.text.docutils.user/2905
- try:
- path = path.decode(sys.getfilesystemencoding(), 'strict')
-+ except AttributeError: # default value None has no decode method
-+ return nodes.reprunicode(path)
- except UnicodeDecodeError:
- path = path.decode('utf-8', 'strict')
- try:
Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series 2010-07-07 18:18:20 UTC (rev 13841)
+++ packages/python-docutils/trunk/debian/patches/series 2010-07-07 18:33:27 UTC (rev 13842)
@@ -8,5 +8,3 @@
15_emacs_debian_paths.diff
16_disable_picins.diff
17_revert_buildhtml.diff
-decode-path-none.diff
-alltest-exitcode.diff
More information about the Python-modules-commits
mailing list