[Python-modules-commits] r18091 - in packages/python-docutils/trunk/debian (17 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Mon Aug 8 18:39:56 UTC 2011
Date: Monday, August 8, 2011 @ 18:39:53
Author: jwilk
Revision: 18091
New upstream release.
Modified:
packages/python-docutils/trunk/debian/changelog
packages/python-docutils/trunk/debian/control
packages/python-docutils/trunk/debian/copyright
packages/python-docutils/trunk/debian/docutils-common.manpages
packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.diff
packages/python-docutils/trunk/debian/patches/12_more_usrbinenv.diff
packages/python-docutils/trunk/debian/patches/13_install_roman.diff
packages/python-docutils/trunk/debian/patches/15_emacs_debian_paths.diff
packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff
packages/python-docutils/trunk/debian/patches/series
packages/python-docutils/trunk/debian/rules
Deleted:
packages/python-docutils/trunk/debian/patches/16_disable_picins.diff
packages/python-docutils/trunk/debian/patches/buildhtml-local.diff
packages/python-docutils/trunk/debian/patches/emacs-shell-quote.diff
packages/python-docutils/trunk/debian/patches/emacs-temporary-files.diff
packages/python-docutils/trunk/debian/patches/python3.2-configparser.diff
packages/python-docutils/trunk/debian/patches/python3.2-elementtree.diff
Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/changelog 2011-08-08 18:39:53 UTC (rev 18091)
@@ -1,3 +1,22 @@
+python-docutils (0.8-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ + Drop the following patches:
+ - 16_disable_picins.diff (newlatex2e writer dropped);
+ - buildhtml-local.diff (applied upstream);
+ - emacs-shell-quote.diff (applied upstream);
+ - emacs-temporary-files.diff (different fix applied upstream);
+ - python3.2-configparser.diff (applied upstream);
+ - python3.2-elementtree.diff (applied upstream);
+ + Refresh other patches.
+ * Update copyright file.
+ * Use wildcards in debian/*.manpages.
+ * Drop the rst2newlatex script.
+ * Add reStructured Text to XeLaTeX converter: rst2xetex.
+ + Add ttf-linux-libertine to python(3)-docutils Suggests.
+
+ -- Jakub Wilk <jwilk at debian.org> Mon, 08 Aug 2011 20:30:25 +0200
+
python-docutils (0.7-4) unstable; urgency=low
* Upload to unstable.
Modified: packages/python-docutils/trunk/debian/control
===================================================================
--- packages/python-docutils/trunk/debian/control 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/control 2011-08-08 18:39:53 UTC (rev 18091)
@@ -29,7 +29,7 @@
libpaper-utils,
python-lxml,
docutils-doc (= ${source:Version})
-Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french
+Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french, ttf-linux-libertine
Conflicts: python-odtwriter,
docutils-writer-odt
Replaces: python-odtwriter,
@@ -60,7 +60,7 @@
Conflicts: python-docutils (<< 0.7-3~),
python-odtwriter,
docutils-writer-odt
-Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french, docutils-doc
+Suggests: texlive-latex-recommended, texlive-latex-base, texlive-lang-french, docutils-doc , ttf-linux-libertine
Description: text processing system for reStructuredText (implemented in Python 3)
reStructuredText is an easy-to-read, what-you-see-is-what-you-get plaintext
markup syntax and parser system. It is useful for in-line program documentation
Modified: packages/python-docutils/trunk/debian/copyright
===================================================================
--- packages/python-docutils/trunk/debian/copyright 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/copyright 2011-08-08 18:39:53 UTC (rev 18091)
@@ -73,6 +73,72 @@
On Debian systems the text of the GNU Lesser General Public License
version 2.1 can be found in /usr/share/common-licenses/LGPL-2.1.
+* docutils/math/__init__.py,
+ docutils/math/latex2mathml.py,
+ docutils/writers/xetex/__init__.py,
+ docutils/error_reporting.py:
+
+ Copyright © Günter Milde
+
+ Released under the terms of the 2-Clause BSD license:
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+* docutils/math/math2html.py,
+ docutils/writers/html4css1/math.css
+
+ Copyright © Alex Fernández
+
+ These files are part of eLyXer_, released under the GNU General Public
+ License version 3 or later. The author relicensed them for Docutils under the
+ terms of the 2-Clause BSD license:
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ .. _eLyXer: http://www.nongnu.org/elyxer/
+
* extras/roman.py:
Copyright © 2001 Mark Pilgrim
Modified: packages/python-docutils/trunk/debian/docutils-common.manpages
===================================================================
--- packages/python-docutils/trunk/debian/docutils-common.manpages 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/docutils-common.manpages 2011-08-08 18:39:53 UTC (rev 18091)
@@ -1,11 +1 @@
-debian/tmp/man/rst2html.1
-debian/tmp/man/rst2xml.1
-debian/tmp/man/rst2latex.1
-debian/tmp/man/rst2man.1
-debian/tmp/man/rst2newlatex.1
-debian/tmp/man/rst2odt.1
-debian/tmp/man/rst2odt_prepstyles.1
-debian/tmp/man/rst2pseudoxml.1
-debian/tmp/man/rst2s5.1
-debian/tmp/man/rstpep2html.1
-debian/tmp/man/rst-buildhtml.1
+debian/tmp/man/*.1
Modified: packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.diff 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.diff 2011-08-08 18:39:53 UTC (rev 18091)
@@ -34,7 +34,7 @@
This is for those who want to get up & running quickly. Read on for
complete details.
-@@ -283,6 +294,12 @@
+@@ -286,6 +297,12 @@
the front-end tools for details on options and arguments. See
Docutils Front-End Tools (``docs/user/tools.txt``) for full documentation.
Modified: packages/python-docutils/trunk/debian/patches/12_more_usrbinenv.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/12_more_usrbinenv.diff 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/patches/12_more_usrbinenv.diff 2011-08-08 18:39:53 UTC (rev 18091)
@@ -6,14 +6,11 @@
tools/editors/emacs/tests/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/tools/editors/emacs/tests/Makefile b/tools/editors/emacs/tests/Makefile
-index bf088b1..ed69bda 100644
--- a/tools/editors/emacs/tests/Makefile
+++ b/tools/editors/emacs/tests/Makefile
@@ -1,4 +1,4 @@
-#!/usr/bin/env make
+#!/usr/bin/make -f
- EMACS=/usr/bin/emacs
-
---
+ EMACS = /usr/bin/emacs
+ ERT = ~/lib/emacs/ert
Modified: packages/python-docutils/trunk/debian/patches/13_install_roman.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/13_install_roman.diff 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/patches/13_install_roman.diff 2011-08-08 18:39:53 UTC (rev 18091)
@@ -16,7 +16,7 @@
--- a/setup.py
+++ b/setup.py
-@@ -210,6 +210,11 @@
+@@ -215,6 +215,11 @@
List of (module name, minimum __version__ string, [attribute names])."""
def get_extras():
Modified: packages/python-docutils/trunk/debian/patches/15_emacs_debian_paths.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/15_emacs_debian_paths.diff 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/patches/15_emacs_debian_paths.diff 2011-08-08 18:39:53 UTC (rev 18091)
@@ -7,13 +7,11 @@
tools/editors/emacs/rst.el | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
-diff --git a/tools/editors/emacs/rst.el b/tools/editors/emacs/rst.el
-index 40213d6..a47943a 100644
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
-@@ -3201,13 +3201,13 @@ document with \\[rst-compile]."
- :version "21.1")
+@@ -3715,13 +3715,13 @@
+ ;; FIXME: Should be `defcustom`
(defvar rst-compile-toolsets
- '((html . ("rst2html.py" ".html" nil))
- (latex . ("rst2latex.py" ".tex" nil))
@@ -29,16 +27,6 @@
+ (xml . ("rst2xml" ".xml" nil))
+ (pdf . ("rst2pdf" ".pdf" nil))
+ (s5 . ("rst2s5" ".xml" nil)))
- "An association list of the toolset to a list of the (command to use,
+ "Table describing the command to use for each toolset.
+ An association list of the toolset to a list of the (command to use,
extension of produced filename, options to the tool (nil or a
- string)) to be used for converting the document.")
-@@ -3215,7 +3215,7 @@ string)) to be used for converting the document.")
- ;; Note for Python programmers not familiar with association lists: you can set
- ;; values in an alists like this, e.g. :
- ;; (setcdr (assq 'html rst-compile-toolsets)
--;; '("rst2html.py" ".htm" "--stylesheet=/docutils.css"))
-+;; '("rst2html" ".htm" "--stylesheet=/docutils.css"))
-
-
- (defvar rst-compile-primary-toolset 'html
---
Deleted: packages/python-docutils/trunk/debian/patches/16_disable_picins.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/16_disable_picins.diff 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/patches/16_disable_picins.diff 2011-08-08 18:39:53 UTC (rev 18091)
@@ -1,42 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sun, 6 Dec 2009 23:44:36 +0000
-Subject: [PATCH] Remove reference to picins from newlatex2e's base.tex
-
-picins.sty is non-free and is not shipped by Debian. The only reference I
-can find to it is in a "sidebar" command defined in base.tex, which is not
-used anywhere else in base.tex or __init__.py, so hopefully removing it
-won't hurt.
----
- docutils/writers/newlatex2e/base.tex | 4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-diff --git a/docutils/writers/newlatex2e/base.tex b/docutils/writers/newlatex2e/base.tex
-index 4955e60..64a4d4f 100644
---- a/docutils/writers/newlatex2e/base.tex
-+++ b/docutils/writers/newlatex2e/base.tex
-@@ -81,8 +81,6 @@
- \usepackage{color}
- % Get \textnhtt macro (non-hyphenating type writer).
- \usepackage{hyphenat}
-- % For sidebars.
-- \usepackage{picins}
- % We use longtable to create tables.
- \usepackage{longtable}
- % Images.
-@@ -801,7 +799,6 @@
- % Width.
- \Dprovidelength{\Dsidebarwidth}{0.45\linewidth}
- \providecommand{\DNsidebar}[1]{
-- \parpic[\Dsidebarposition]{%
- \begin{minipage}[t]{\Dsidebarwidth}%
- % Doing this with nested minipages is ugly, but I haven't found
- % another way to place vertical space before and after the fbox.
-@@ -818,7 +815,6 @@
- }%
- \vspace{\Dsidebarvmargin}%
- \end{minipage}%
-- }%
- }
-
-
---
Deleted: packages/python-docutils/trunk/debian/patches/buildhtml-local.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/buildhtml-local.diff 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/patches/buildhtml-local.diff 2011-08-08 18:39:53 UTC (rev 18091)
@@ -1,38 +0,0 @@
-Description: Fix --local option for tools/buildhtml.py.
-Origin: upstream, http://svn.berlios.de/viewvc/docutils/trunk/docutils/tools/buildhtml.py?r1=6366&r2=6371
-Bug: http://sourceforge.net/tracker/?func=detail&aid=2909811&group_id=38414&atid=422030
-Last-Update: 2010-07-11
-
---- a/tools/buildhtml.py
-+++ b/tools/buildhtml.py
-@@ -181,14 +181,14 @@
- else:
- self.directories = [os.getcwd()]
- for directory in self.directories:
-- try:
-- for root, dirs, files in os.walk(directory):
-- self.visit(recurse, root, dirs+files)
-- except (AttributeError): # python2.2 does not have os.walk
-- print "no os.walk"
-- os.path.walk(directory, self.visit, recurse)
-+ for root, dirs, files in os.walk(directory):
-+ # os.walk by default this recurses down the tree,
-+ # influence by modifying dirs.
-+ if not recurse:
-+ del dirs[:]
-+ self.visit(root, dirs+files)
-
-- def visit(self, recurse, directory, names):
-+ def visit(self, directory, names):
- settings = self.get_settings('', directory)
- if settings.prune and (os.path.abspath(directory) in settings.prune):
- print >>sys.stderr, '/// ...Skipping directory (pruned):', directory
-@@ -211,8 +211,6 @@
- prune = self.process_txt(directory, name)
- if prune:
- break
-- if not recurse:
-- del names[:]
-
- def process_txt(self, directory, name):
- if name.startswith('pep-'):
Deleted: packages/python-docutils/trunk/debian/patches/emacs-shell-quote.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/emacs-shell-quote.diff 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/patches/emacs-shell-quote.diff 2011-08-08 18:39:53 UTC (rev 18091)
@@ -1,23 +0,0 @@
-Description: Properly quote arguments passed to shell.
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: yes
-Bug: http://sourceforge.net/tracker/?func=detail&aid=3001100&group_id=38414&atid=422030
-Bug-Debian: http://bugs.debian.org/581522
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/579252
-
---- a/tools/editors/emacs/rst.el
-+++ b/tools/editors/emacs/rst.el
-@@ -3273,10 +3273,10 @@
- (list command
- (or options "")
- (if conffile
-- (concat "--config=\"" conffile "\"")
-+ (concat "--config=" (shell-quote-argument conffile))
- "")
-- bufname
-- (concat outname extension))
-+ (shell-quote-argument bufname)
-+ (shell-quote-argument (concat outname extension)))
- " "))
-
- ;; Invoke the compile command.
Deleted: packages/python-docutils/trunk/debian/patches/emacs-temporary-files.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/emacs-temporary-files.diff 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/patches/emacs-temporary-files.diff 2011-08-08 18:39:53 UTC (rev 18091)
@@ -1,103 +0,0 @@
-Description: Fix insecure use of temporary files in rst.el.
- Fix insecure (susceptible to symlink attacks) use of temporary files in the
- Emacs major mode for reStructuredText (rst.el).
-Author: Jakub Wilk <jwilk at debian.org>
-Bug: http://sourceforge.net/tracker/?func=detail&aid=2912890&group_id=38414&atid=422030
-Bug-Debian: http://bugs.debian.org/560755
-Last-Update: 2011-03-02
-
-Index: python-docutils-0.6/tools/editors/emacs/rst.el
-===================================================================
---- python-docutils-0.6.orig/tools/editors/emacs/rst.el 2009-05-21 11:02:22.000000000 +0200
-+++ python-docutils-0.6/tools/editors/emacs/rst.el 2009-12-15 13:10:49.000000000 +0100
-@@ -3301,13 +3301,80 @@
- (cadr (assq 'pseudoxml rst-compile-toolsets))
- standard-output)))
-
-+(defvar rst-temp-dir nil)
-+(make-variable-buffer-local 'rst-temp-dir)
-+
-+;; make-temp-file is not available in XEmacs 21
-+(if (fboundp 'make-temp-file)
-+ (defun rst-make-temp-dir (prefix) (make-temp-file prefix t))
-+ (defun rst-make-temp-dir (prefix)
-+ (let ((umask (default-file-modes)) file)
-+ (unwind-protect
-+ (progn
-+ (set-default-file-modes 448) ; o700
-+ (while
-+ (condition-case ()
-+ (progn
-+ (setq file
-+ (make-temp-name
-+ (if (zerop (length prefix))
-+ (file-name-as-directory (temp-directory))
-+ (expand-file-name prefix (temp-directory))
-+ )
-+ )
-+ )
-+ (make-directory file)
-+ nil
-+ )
-+ (file-already-exists t)
-+ )
-+ nil
-+ )
-+ file
-+ )
-+ (set-default-file-modes umask)
-+ )
-+ )
-+ )
-+)
-+
-+(defun rst-get-temp-dir ()
-+ (or rst-temp-dir
-+ (setq rst-temp-dir
-+ (file-name-as-directory (rst-make-temp-dir "rst-"))
-+ )
-+ )
-+)
-+
-+;; dired-delete-file is not available in XEmacs 21
-+(defun rst-delete-file (file)
-+ (if (not (eq t (car (file-attributes file))))
-+ (delete-file file)
-+ (when
-+ (setq files (directory-files file t "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))
-+ (while files
-+ (rst-delete-file (car files))
-+ (setq files (cdr files))
-+ )
-+ )
-+ (delete-directory file)
-+ )
-+)
-+
-+(defun rst-remove-temp-dir ()
-+ (if rst-temp-dir (rst-delete-file rst-temp-dir))
-+)
-+
-+(add-hook 'kill-buffer-hook 'rst-remove-temp-dir)
-+(add-hook 'kill-emacs-hook 'rst-remove-temp-dir)
-+
- (defvar rst-pdf-program "xpdf"
- "Program used to preview PDF files.")
-
- (defun rst-compile-pdf-preview ()
- "Convert the document to a PDF file and launch a preview program."
- (interactive)
-- (let* ((tmp-filename "/tmp/out.pdf")
-+ (let* ((tmp-filename (concat (rst-get-temp-dir) "out.pdf"))
- (command (format "%s %s %s && %s %s"
- (cadr (assq 'pdf rst-compile-toolsets))
- buffer-file-name tmp-filename
-@@ -3323,7 +3390,7 @@
- (defun rst-compile-slides-preview ()
- "Convert the document to an S5 slide presentation and launch a preview program."
- (interactive)
-- (let* ((tmp-filename "/tmp/slides.html")
-+ (let* ((tmp-filename (concat (rst-get-temp-dir) "slides.html"))
- (command (format "%s %s %s && %s %s"
- (cadr (assq 's5 rst-compile-toolsets))
- buffer-file-name tmp-filename
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 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff 2011-08-08 18:39:53 UTC (rev 18091)
@@ -11,9 +11,9 @@
import time
+import docutils
from docutils import io, nodes, statemachine, utils
+ from docutils.error_reporting import SafeString, ErrorString
from docutils.parsers.rst import Directive, convert_directive_function
- from docutils.parsers.rst import directives, roles, states
-@@ -38,7 +39,7 @@
+@@ -39,7 +40,7 @@
'start-after': directives.unchanged_required,
'end-before': directives.unchanged_required}
@@ -24,7 +24,7 @@
def run(self):
--- a/docutils/writers/html4css1/__init__.py
+++ b/docutils/writers/html4css1/__init__.py
-@@ -37,13 +37,13 @@
+@@ -39,13 +39,13 @@
default_stylesheet_path = utils.relative_path(
os.path.join(os.getcwd(), 'dummy'),
@@ -42,15 +42,15 @@
'HTML-Specific Options',
--- a/docutils/writers/latex2e/__init__.py
+++ b/docutils/writers/latex2e/__init__.py
-@@ -17,6 +17,7 @@
- import time
+@@ -18,6 +18,7 @@
import re
import string
+ import urllib
+import docutils
from docutils import frontend, nodes, languages, writers, utils, io
from docutils.transforms import writer_aux
-
-@@ -31,7 +32,7 @@
+ from docutils.math import unimathsymbols2tex, pick_math_environment
+@@ -33,7 +34,7 @@
"""Formats this writer supports."""
default_template = 'default.tex'
@@ -59,29 +59,9 @@
default_preamble = '\n'.join([r'% PDF Standard Fonts',
r'\usepackage{mathptmx} % Times',
-@@ -239,7 +240,7 @@
- try:
- file = open(self.document.settings.template, 'rb')
- except IOError:
-- file = open(os.path.join(os.path.dirname(__file__),
-+ file = open(os.path.join(docutils._datadir(__file__),
- self.document.settings.template), 'rb')
- template = string.Template(unicode(file.read(), 'utf-8'))
- file.close()
---- a/docutils/writers/newlatex2e/__init__.py
-+++ b/docutils/writers/newlatex2e/__init__.py
-@@ -31,7 +31,7 @@
-
- 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))
-
- settings_spec = (
- 'LaTeX-Specific Options',
--- a/docutils/writers/odf_odt/__init__.py
+++ b/docutils/writers/odf_odt/__init__.py
-@@ -372,13 +372,13 @@
+@@ -394,13 +394,13 @@
default_stylesheet_path = utils.relative_path(
os.path.join(os.getcwd(), 'dummy'),
@@ -128,7 +108,7 @@
# Where else to look for a theme?
--- a/docutils/__init__.py
+++ b/docutils/__init__.py
-@@ -202,3 +202,18 @@
+@@ -212,3 +212,18 @@
a certain input context or output format.
"""
return format in self.supported
Deleted: packages/python-docutils/trunk/debian/patches/python3.2-configparser.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/python3.2-configparser.diff 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/patches/python3.2-configparser.diff 2011-08-08 18:39:53 UTC (rev 18091)
@@ -1,52 +0,0 @@
-Description: Fix incompatibility with Python 3.2 ConfigParser.
-Origin: upstream, http://svn.berlios.de/viewvc/docutils/trunk/docutils/docutils/frontend.py?r1=7027&r2=7029
-Bug: http://sourceforge.net/tracker/?func=detail&atid=422030&aid=3149845&group_id=38414
-Last-Update: 2011-06-28
-
---- a/docutils/frontend.py
-+++ b/docutils/frontend.py
-@@ -671,7 +671,7 @@
- raise KeyError('No option with dest == %r.' % dest)
-
-
--class ConfigParser(CP.ConfigParser):
-+class ConfigParser(CP.RawConfigParser):
-
- old_settings = {
- 'pep_stylesheet': ('pep_html writer', 'stylesheet'),
-@@ -693,7 +693,7 @@
- """
-
- def __init__(self, *args, **kwargs):
-- CP.ConfigParser.__init__(self, *args, **kwargs)
-+ CP.RawConfigParser.__init__(self, *args, **kwargs)
-
- self._files = []
- """List of paths of configuration files read."""
-@@ -708,7 +708,7 @@
- except IOError:
- continue
- try:
-- CP.ConfigParser.readfp(self, fp, filename)
-+ CP.RawConfigParser.readfp(self, fp, filename)
- except UnicodeDecodeError:
- sys.stderr.write(self.not_utf8_error % (filename, filename))
- fp.close()
-@@ -749,7 +749,7 @@
- except KeyError:
- continue
- if option.validator:
-- value = self.get(section, setting, raw=1)
-+ value = self.get(section, setting)
- try:
- new_value = option.validator(
- setting, value, option_parser,
-@@ -778,7 +778,7 @@
- section_dict = {}
- if self.has_section(section):
- for option in self.options(section):
-- section_dict[option] = self.get(section, option, raw=1)
-+ section_dict[option] = self.get(section, option)
- return section_dict
-
-
Deleted: packages/python-docutils/trunk/debian/patches/python3.2-elementtree.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/python3.2-elementtree.diff 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/patches/python3.2-elementtree.diff 2011-08-08 18:39:53 UTC (rev 18091)
@@ -1,18 +0,0 @@
-Description: Fix incompatibility with Python 3.2 ElementTree.
-Origin: upstream, http://svn.berlios.de/viewvc/docutils/trunk/docutils/docutils/writers/odf_odt/__init__.py?r1=6988&r2=7013
-Last-Update: 2011-06-28
-
---- a/docutils/writers/odf_odt/__init__.py
-+++ b/docutils/writers/odf_odt/__init__.py
-@@ -300,7 +300,10 @@
-
- def ToString(et):
- outstream = StringIO.StringIO()
-- et.write(outstream)
-+ if sys.version_info >= (3, 2):
-+ et.write(outstream, encoding="unicode")
-+ else:
-+ et.write(outstream)
- s1 = outstream.getvalue()
- outstream.close()
- return s1
Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/patches/series 2011-08-08 18:39:53 UTC (rev 18091)
@@ -2,11 +2,5 @@
10_doc_debian_paths.diff
12_more_usrbinenv.diff
13_install_roman.diff
-emacs-temporary-files.diff
-emacs-shell-quote.diff
15_emacs_debian_paths.diff
-16_disable_picins.diff
-buildhtml-local.diff
-python3.2-configparser.diff
-python3.2-elementtree.diff
move-data-to-usr-share.diff
Modified: packages/python-docutils/trunk/debian/rules
===================================================================
--- packages/python-docutils/trunk/debian/rules 2011-08-08 16:28:00 UTC (rev 18090)
+++ packages/python-docutils/trunk/debian/rules 2011-08-08 18:39:53 UTC (rev 18091)
@@ -12,11 +12,11 @@
rst2html \
rst2latex \
rst2man \
- rst2newlatex \
rst2odt \
rst2odt_prepstyles \
rst2pseudoxml \
rst2s5 \
+ rst2xetex \
rst2xml \
rstpep2html \
More information about the Python-modules-commits
mailing list