[Python-modules-commits] r21604 - in packages/python-docutils/trunk/debian (18 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Sat May 5 22:28:20 UTC 2012
Date: Saturday, May 5, 2012 @ 22:28:19
Author: jwilk
Revision: 21604
New upstream release.
Modified:
packages/python-docutils/trunk/debian/changelog
packages/python-docutils/trunk/debian/control
packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.diff
packages/python-docutils/trunk/debian/patches/emacs-sensible-browser.diff
packages/python-docutils/trunk/debian/patches/fix-docutilsxmltestcase-debian.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/13_install_roman.diff
packages/python-docutils/trunk/debian/patches/15_emacs_debian_paths.diff
packages/python-docutils/trunk/debian/patches/add-missing-import.diff
packages/python-docutils/trunk/debian/patches/fix-docutilsxmltestcase.diff
packages/python-docutils/trunk/debian/patches/fix-error-reporting-encoding-issues.diff
packages/python-docutils/trunk/debian/patches/fix-io-encoding-issues.diff
packages/python-docutils/trunk/debian/patches/languages-get_language-2nd-arg-optional.diff
packages/python-docutils/trunk/debian/patches/readme-version.diff
packages/python-docutils/trunk/debian/python-roman.install
packages/python-docutils/trunk/debian/python3-roman.install
Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/changelog 2012-05-05 22:28:19 UTC (rev 21604)
@@ -1,5 +1,16 @@
-python-docutils (0.8.1-7) UNRELEASED; urgency=low
+python-docutils (0.9-1) UNRELEASED; urgency=low
+ * New upstream release.
+ + Drop 13_install_roman.diff and stop building python(3)-roman binary
+ packages.
+ + Drop 15_emacs_debian_paths.diff: different fix applied upstream.
+ + Drop readme-version.diff: no longer relevant.
+ + Drop languages-get_language-2nd-arg-optional.diff: applied upstream.
+ + Drop add-missing-import.diff: applied upstream.
+ + Drop fix-error-reporting-encoding-issues.diff: applied upstream.
+ + Drop fix-io-encoding-issues.diff: applied upstream.
+ + Drop fix-docutilsxmltestcase.diff: applied upstream.
+ + Refresh other patches.
* Update move-data-to-usr-share.diff to cover the test/ directory, too.
* Add DEP-8 tests.
Modified: packages/python-docutils/trunk/debian/control
===================================================================
--- packages/python-docutils/trunk/debian/control 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/control 2012-05-05 22:28:19 UTC (rev 21604)
@@ -111,23 +111,3 @@
LaTeX, ODT or Unix manpages.
.
This package includes documentation in HTML and (gzipped) reST formats.
-
-Package: python-roman
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
-Description: module for generating/analyzing Roman numerals for Python 2
- This module converts from and to Roman numerals. It can convert numbers
- from 1 to 4999 and understands the common shortcuts (IX == 9), but not
- illegal ones (MIM == 1999).
- .
- This package includes Python 2 modules.
-
-Package: python3-roman
-Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
-Description: module for generating/analyzing Roman numerals for Python 3
- This module converts from and to Roman numerals. It can convert numbers
- from 1 to 4999 and understands the common shortcuts (IX == 9), but not
- illegal ones (MIM == 1999).
- .
- This package includes Python 3 modules.
Modified: packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.diff 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/patches/10_doc_debian_paths.diff 2012-05-05 22:28:19 UTC (rev 21604)
@@ -34,7 +34,7 @@
This is for those who want to get up & running quickly. Read on for
complete details.
-@@ -286,6 +297,12 @@
+@@ -287,6 +298,12 @@
the front-end tools for details on options and arguments. See
Docutils Front-End Tools (``docs/user/tools.txt``) for full documentation.
Deleted: packages/python-docutils/trunk/debian/patches/13_install_roman.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/13_install_roman.diff 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/patches/13_install_roman.diff 2012-05-05 22:28:19 UTC (rev 21604)
@@ -1,30 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sun, 6 Dec 2009 23:44:04 +0000
-Subject: [PATCH] Force roman.py to be installed even if it's already installed
-
-Upstream treats this copy of roman.py as a convenience copy, but Debian
-doesn't ship roman.py any other way, so we treat this as the canonical
-way to get it.
-
-Creating Debian packages should be deterministic, and we don't want to
-have to build-conflict on ourselves.
-
-Forwarded: not-needed
----
- setup.py | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
---- a/setup.py
-+++ b/setup.py
-@@ -215,6 +215,11 @@
- List of (module name, minimum __version__ string, [attribute names])."""
-
- def get_extras():
-+ # In Debian, this source package is treated as the canonical source of
-+ # roman.py, not just as a convenience copy (we don't have a separate
-+ # source package for roman.py), so we must always install it.
-+ return ['roman']
-+
- extras = []
- for module_name, version, attributes in extra_modules:
- try:
Deleted: packages/python-docutils/trunk/debian/patches/15_emacs_debian_paths.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/15_emacs_debian_paths.diff 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/patches/15_emacs_debian_paths.diff 2012-05-05 22:28:19 UTC (rev 21604)
@@ -1,32 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sun, 6 Dec 2009 23:44:30 +0000
-Subject: [PATCH] rst.el: use Debian-style tool names, without the .py extension
-
-Bug-Debian: http://bugs.debian.org/438667
----
- tools/editors/emacs/rst.el | 16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
-
---- a/tools/editors/emacs/rst.el
-+++ b/tools/editors/emacs/rst.el
-@@ -3715,13 +3715,13 @@
-
- ;; FIXME: Should be `defcustom`
- (defvar rst-compile-toolsets
-- '((html . ("rst2html.py" ".html" nil))
-- (latex . ("rst2latex.py" ".tex" nil))
-- (newlatex . ("rst2newlatex.py" ".tex" nil))
-- (pseudoxml . ("rst2pseudoxml.py" ".xml" nil))
-- (xml . ("rst2xml.py" ".xml" nil))
-- (pdf . ("rst2pdf.py" ".pdf" nil))
-- (s5 . ("rst2s5.py" ".xml" nil)))
-+ '((html . ("rst2html" ".html" nil))
-+ (latex . ("rst2latex" ".tex" nil))
-+ (newlatex . ("rst2newlatex" ".tex" nil))
-+ (pseudoxml . ("rst2pseudoxml" ".xml" nil))
-+ (xml . ("rst2xml" ".xml" nil))
-+ (pdf . ("rst2pdf" ".pdf" nil))
-+ (s5 . ("rst2s5" ".xml" nil)))
- "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
Deleted: packages/python-docutils/trunk/debian/patches/add-missing-import.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/add-missing-import.diff 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/patches/add-missing-import.diff 2012-05-05 22:28:19 UTC (rev 21604)
@@ -1,15 +0,0 @@
-Description: Add missing import.
-Origin: upstream, http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/docutils/frontend.py?r1=7071&r2=7196
-Last-Update: 2011-12-31
-
---- a/docutils/frontend.py
-+++ b/docutils/frontend.py
-@@ -38,7 +38,7 @@
- import docutils
- import docutils.utils
- import docutils.nodes
--from docutils.error_reporting import locale_encoding, ErrorOutput
-+from docutils.error_reporting import locale_encoding, ErrorOutput, ErrorString
-
-
- def store_multiple(option, opt, value, parser, *args, **kwargs):
Modified: packages/python-docutils/trunk/debian/patches/emacs-sensible-browser.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/emacs-sensible-browser.diff 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/patches/emacs-sensible-browser.diff 2012-05-05 22:28:19 UTC (rev 21604)
@@ -7,7 +7,7 @@
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
-@@ -3830,7 +3830,7 @@
+@@ -3963,7 +3963,7 @@
))
;; FIXME: Should be `defcustom` or use something like `browse-url`
Modified: packages/python-docutils/trunk/debian/patches/fix-docutilsxmltestcase-debian.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/fix-docutilsxmltestcase-debian.diff 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/patches/fix-docutilsxmltestcase-debian.diff 2012-05-05 22:28:19 UTC (rev 21604)
@@ -9,10 +9,11 @@
--- a/test/test_writers/test_docutils_xml.py
+++ b/test/test_writers/test_docutils_xml.py
-@@ -15,6 +15,14 @@
- import docutils.core
- from docutils._compat import b
+@@ -119,6 +119,16 @@
+ </document>
+ """
++import sys
+if sys.version_info[:3] in [(2, 7, 2), (3, 2, 2)]:
+ import xml.dom.minidom as minidom
+ if minidom.parseString('<x><y>z</y></x>').toprettyxml() == '<?xml version="1.0" ?>\n<x>\n\t<y>z</y>\n</x>\n':
@@ -21,6 +22,7 @@
+ version_info = sys_version_info
+ del sys_version_info
+ del minidom
++del sys
- class DocutilsXMLTestCase(DocutilsTestSupport.StandardTestCase):
-
+ def publish_xml(settings, source):
+ return docutils.core.publish_string(source=source.encode('utf8'),
Deleted: packages/python-docutils/trunk/debian/patches/fix-docutilsxmltestcase.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/fix-docutilsxmltestcase.diff 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/patches/fix-docutilsxmltestcase.diff 2012-05-05 22:28:19 UTC (rev 21604)
@@ -1,62 +0,0 @@
-Description: Follow the changes in xml.dom.minidom.Document.toprettyxml().
- xml.dom.minidom.Document.toprettyxml() has change behaviour in Python 2.7.3
- and 3.3.3. See http://bugs.python.org/issue4147 for details.
- .
- This patch updates DocutilsXMLTestCase to cope with these changes.
-Origin: backport, http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/test/test_writers/test_docutils_xml.py?r1=7221&r2=7226
-Bug: http://sourceforge.net/tracker/?func=detail&aid=3423983&group_id=38414&atid=422030
-Bug-Debian: http://bugs.debian.org/645369
-Last-Update: 2011-12-31
-
---- a/test/test_writers/test_docutils_xml.py
-+++ b/test/test_writers/test_docutils_xml.py
-@@ -10,6 +10,7 @@
-
- from __init__ import DocutilsTestSupport
-
-+import sys
- import docutils
- import docutils.core
- from docutils._compat import b
-@@ -29,6 +30,13 @@
- bodynormal = b('<document source="<string>"><paragraph>Test</paragraph><transition/><paragraph>Test. \xe4\xf6\xfc€</paragraph></document>')
- bodynewlines = b("""\
- <document source="<string>">
-+<paragraph>Test</paragraph>
-+<transition/>
-+<paragraph>Test. \xe4\xf6\xfc€</paragraph>
-+</document>
-+""")
-+ bodynewlines_old = b("""\
-+<document source="<string>">
- <paragraph>
- Test
- </paragraph>
-@@ -40,6 +48,13 @@
- """)
- bodyindents = b("""\
- <document source="<string>">
-+ <paragraph>Test</paragraph>
-+ <transition/>
-+ <paragraph>Test. \xe4\xf6\xfc€</paragraph>
-+</document>
-+""")
-+ bodyindents_old = b("""\
-+<document source="<string>">
- <paragraph>
- Test
- </paragraph>
-@@ -79,6 +94,13 @@
- settings_overrides=settings),
- expected)
-
-+ # New formatting introduced in versions 2.7.3 and 3.2.3 on 2011-11-18
-+ # to fix http://bugs.python.org/issue4147
-+ if (sys.version_info < (2, 7, 3) or
-+ sys.version_info[0] == 3 and sys.version_info < (3, 2, 3)):
-+ bodynewlines = bodynewlines_old
-+ bodyindents = bodyindents_old
-+
-
- if __name__ == '__main__':
- import unittest
Deleted: packages/python-docutils/trunk/debian/patches/fix-error-reporting-encoding-issues.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/fix-error-reporting-encoding-issues.diff 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/patches/fix-error-reporting-encoding-issues.diff 2012-05-05 22:28:19 UTC (rev 21604)
@@ -1,26 +0,0 @@
-Description: Fix encoding issues in error reporting for Python 3.
-Origin: upstream, http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/docutils/error_reporting.py?r1=7073&r2=7196
-Last-Update: 2011-12-31
-
---- a/docutils/error_reporting.py
-+++ b/docutils/error_reporting.py
-@@ -184,13 +184,17 @@
- except UnicodeEncodeError:
- self.stream.write(data.encode(self.encoding, self.encoding_errors))
- except TypeError: # in Python 3, stderr expects unicode
-- self.stream.write(unicode(data, self.encoding, self.decoding_errors))
-+ if self.stream in (sys.stderr, sys.stdout):
-+ self.stream.buffer.write(data) # write bytes to raw stream
-+ else:
-+ self.stream.write(unicode(data, self.encoding,
-+ self.decoding_errors))
-
- def close(self):
- """
- Close the error-output stream.
-
-- Ignored if the stream is` sys.stderr` or `sys.stdout` or has no
-+ Ignored if the stream is` sys.stderr` or `sys.stdout` or has no
- close() method.
- """
- if self.stream in (sys.stdout, sys.stderr):
Deleted: packages/python-docutils/trunk/debian/patches/fix-io-encoding-issues.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/fix-io-encoding-issues.diff 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/patches/fix-io-encoding-issues.diff 2012-05-05 22:28:19 UTC (rev 21604)
@@ -1,130 +0,0 @@
-Description: Fix encoding issues in file I/O for Python 3.
-Bug: http://sourceforge.net/tracker/?func=detail&aid=3395948&group_id=38414&atid=422030
-Origin: upstream, http://docutils.svn.sourceforge.net/viewvc/docutils/trunk/docutils/docutils/io.py?r1=7073&r2=7196
-Last-Update: 2011-12-31
-
---- a/docutils/io.py
-+++ b/docutils/io.py
-@@ -10,6 +10,7 @@
- __docformat__ = 'reStructuredText'
-
- import sys
-+import os
- import re
- import codecs
- from docutils import TransformSpec
-@@ -84,10 +85,9 @@
- # Apply heuristics only if no encoding is explicitly given and
- # no BOM found. Start with UTF-8, because that only matches
- # data that *IS* UTF-8:
-- encodings = [enc for enc in ('utf-8',
-- locale_encoding, # can be None
-- 'latin-1') # fallback encoding
-- if enc]
-+ encodings = ['utf-8', 'latin-1']
-+ if locale_encoding:
-+ encodings.insert(1, locale_encoding)
- for enc in encodings:
- try:
- decoded = unicode(data, enc, self.error_handler)
-@@ -224,6 +224,15 @@
- sys.exit(1)
- else:
- self.source = sys.stdin
-+ elif (sys.version_info >= (3,0) and
-+ self.encoding and hasattr(self.source, 'encoding') and
-+ self.encoding != self.source.encoding and
-+ codecs.lookup(self.encoding) !=
-+ codecs.lookup(self.source.encoding)):
-+ # TODO: re-open, warn or raise error?
-+ raise UnicodeError('Encoding clash: encoding given is "%s" '
-+ 'but source is opened with encoding "%s".' %
-+ (self.encoding, self.source.encoding))
- if not source_path:
- try:
- self.source_path = self.source.name
-@@ -234,8 +243,25 @@
- """
- Read and decode a single file and return the data (Unicode string).
- """
-- try:
-- data = self.source.read()
-+ try: # In Python < 2.5, try...except has to be nested in try...finally.
-+ try:
-+ if self.source is sys.stdin and sys.version_info >= (3,0):
-+ # read as binary data to circumvent auto-decoding
-+ data = self.source.buffer.read()
-+ # normalize newlines
-+ data = b('\n').join(data.splitlines()) + b('\n')
-+ else:
-+ data = self.source.read()
-+ except (UnicodeError, LookupError), err: # (in Py3k read() decodes)
-+ if not self.encoding and self.source_path:
-+ # re-read in binary mode and decode with heuristics
-+ b_source = open(self.source_path, 'rb')
-+ data = b_source.read()
-+ b_source.close()
-+ # normalize newlines
-+ data = b('\n').join(data.splitlines()) + b('\n')
-+ else:
-+ raise
- finally:
- if self.autoclose:
- self.close()
-@@ -245,12 +271,7 @@
- """
- Return lines of a single file as list of Unicode strings.
- """
-- try:
-- lines = self.source.readlines()
-- finally:
-- if self.autoclose:
-- self.close()
-- return [self.decode(line) for line in lines]
-+ return self.read().splitlines(True)
-
- def close(self):
- if self.source is not sys.stdin:
-@@ -317,20 +338,34 @@
- def write(self, data):
- """Encode `data`, write it to a single file, and return it.
-
-- In Python 3, a (unicode) string is returned.
-+ In Python 3, `data` is returned unchanged.
- """
-- if sys.version_info >= (3,0):
-- output = data # in py3k, write expects a (Unicode) string
-- else:
-- output = self.encode(data)
-+ if sys.version_info < (3,0):
-+ data = self.encode(data)
- if not self.opened:
- self.open()
-- try:
-- self.destination.write(output)
-+ try: # In Python < 2.5, try...except has to be nested in try...finally.
-+ try:
-+ if (sys.version_info >= (3,0) and self.encoding and
-+ hasattr(self.destination,'encoding') and
-+ self.encoding != self.destination.encoding and
-+ codecs.lookup(self.encoding) !=
-+ codecs.lookup(self.destination.encoding)):
-+ # encode self, write bytes
-+ bdata = self.encode(data)
-+ if os.linesep != '\n':
-+ bdata = bdata.replace('\n', os.linesep)
-+ sys.stdout.buffer.write(bdata)
-+ else:
-+ self.destination.write(data)
-+ except (UnicodeError, LookupError), err: # can only happen in py3k
-+ raise UnicodeError(
-+ 'Unable to encode output data. output-encoding is: '
-+ '%s.\n(%s)' % (self.encoding, ErrorString(err)))
- finally:
- if self.autoclose:
- self.close()
-- return output
-+ return data
-
- def close(self):
- if self.destination not in (sys.stdout, sys.stderr):
Deleted: packages/python-docutils/trunk/debian/patches/languages-get_language-2nd-arg-optional.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/languages-get_language-2nd-arg-optional.diff 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/patches/languages-get_language-2nd-arg-optional.diff 2012-05-05 22:28:19 UTC (rev 21604)
@@ -1,34 +0,0 @@
-Description: Restore historical behavior of languages.get_language() taking only a single argument.
- In Docutils 0.8, a second argument was added to languages.get_language(). This
- patch makes the function accept also only a single argument in order to
- restore its historical behavior.
-Author: Jakub Wilk <jwilk at debian.org>
-Bug: http://sourceforge.net/tracker/?group_id=38414&atid=422030
-Bug-Debian: http://bugs.debian.org/641562
-Last-Update: 2011-09-16
-
---- a/docutils/languages/__init__.py
-+++ b/docutils/languages/__init__.py
-@@ -15,7 +15,7 @@
-
- _languages = {}
-
--def get_language(language_code, reporter):
-+def get_language(language_code, reporter=None):
- """Return module with language localizations.
-
- `language_code` is a "BCP 47" language tag.
-@@ -31,9 +31,10 @@
- continue
- _languages[tag] = module
- return module
-- reporter.warning(
-- 'language "%s" not supported: ' % language_code +
-- 'Docutils-generated text will be in English.')
-+ if reporter is not None:
-+ reporter.warning(
-+ 'language "%s" not supported: ' % language_code +
-+ 'Docutils-generated text will be in English.')
- module = __import__('en', globals(), locals())
- _languages[tag] = module # warn only one time!
- return module
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 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff 2012-05-05 22:28:19 UTC (rev 21604)
@@ -13,9 +13,9 @@
from docutils import io, nodes, statemachine, utils
from docutils.error_reporting import SafeString, ErrorString
from docutils.parsers.rst import Directive, convert_directive_function
-@@ -39,7 +40,7 @@
- 'start-after': directives.unchanged_required,
- 'end-before': directives.unchanged_required}
+@@ -46,7 +47,7 @@
+ 'class': directives.class_option,
+ 'name': directives.unchanged}
- standard_include_path = os.path.join(os.path.dirname(states.__file__),
+ standard_include_path = os.path.join(docutils._datadir(states.__file__),
@@ -24,7 +24,7 @@
def run(self):
--- a/docutils/writers/html4css1/__init__.py
+++ b/docutils/writers/html4css1/__init__.py
-@@ -39,13 +39,13 @@
+@@ -47,13 +47,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
-@@ -18,6 +18,7 @@
- import re
- import string
- import urllib
+@@ -23,6 +23,7 @@
+ import roman
+ except ImportError:
+ import docutils.utils.roman as roman
+import docutils
from docutils import frontend, nodes, languages, writers, utils, io
+ from docutils.error_reporting import SafeString
from docutils.transforms import writer_aux
- from docutils.math import unimathsymbols2tex, pick_math_environment
-@@ -33,7 +34,7 @@
+@@ -39,7 +40,7 @@
"""Formats this writer supports."""
default_template = 'default.tex'
@@ -136,8 +136,8 @@
+import docutils
from docutils.parsers.rst import states
from docutils._compat import b
-
-@@ -41,7 +42,7 @@
+ from docutils.utils.code_analyzer import with_pygments
+@@ -45,7 +46,7 @@
utf_16_error_str = ("UnicodeError: Unable to decode input data. "
"Tried the following encodings: 'ascii'.\n"
" (%s)" % utf_16_error_str)
Deleted: packages/python-docutils/trunk/debian/patches/readme-version.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/readme-version.diff 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/patches/readme-version.diff 2012-05-05 22:28:19 UTC (rev 21604)
@@ -1,17 +0,0 @@
-Description: Correct version number in README.txt.
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: not-needed
-Last-Update: 2011-09-03
-
---- a/README.txt
-+++ b/README.txt
-@@ -1,6 +1,6 @@
--======================
-- README: Docutils 0.9
--======================
-+========================
-+ README: Docutils 0.8.1
-+========================
-
- :Author: David Goodger
- :Contact: goodger at python.org
Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/patches/series 2012-05-05 22:28:19 UTC (rev 21604)
@@ -1,15 +1,7 @@
iepngfix-license.diff
10_doc_debian_paths.diff
-13_install_roman.diff
-15_emacs_debian_paths.diff
emacs-sensible-browser.diff
-readme-version.diff
-languages-get_language-2nd-arg-optional.diff
testall-no-stdout-stderr-redirect.diff
-add-missing-import.diff
-fix-error-reporting-encoding-issues.diff
-fix-io-encoding-issues.diff
-fix-docutilsxmltestcase.diff
fix-docutilsxmltestcase-debian.diff
no-test-skipping.diff
move-data-to-usr-share.diff
Deleted: packages/python-docutils/trunk/debian/python-roman.install
===================================================================
--- packages/python-docutils/trunk/debian/python-roman.install 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/python-roman.install 2012-05-05 22:28:19 UTC (rev 21604)
@@ -1 +0,0 @@
-/usr/lib/python2.*/*-packages/roman.py
Deleted: packages/python-docutils/trunk/debian/python3-roman.install
===================================================================
--- packages/python-docutils/trunk/debian/python3-roman.install 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/python3-roman.install 2012-05-05 22:28:19 UTC (rev 21604)
@@ -1 +0,0 @@
-/usr/lib/python3/dist-packages/roman.py
Modified: packages/python-docutils/trunk/debian/rules
===================================================================
--- packages/python-docutils/trunk/debian/rules 2012-05-05 21:39:06 UTC (rev 21603)
+++ packages/python-docutils/trunk/debian/rules 2012-05-05 22:28:19 UTC (rev 21604)
@@ -43,10 +43,10 @@
cd build/py3/ && $(python3_all) test/alltests.py --verbose
endif
# Build documentation:
- PYTHONPATH=.:extras python tools/buildhtml.py \
+ PYTHONPATH=. python tools/buildhtml.py \
--local --link-stylesheet --traceback \
.
- PYTHONPATH=.:extras python tools/buildhtml.py \
+ PYTHONPATH=. python tools/buildhtml.py \
--link-stylesheet --traceback \
docs
( ls *.html && find docs/ -name '*.html' ) \
@@ -60,7 +60,7 @@
find -name '*.py[co]' -delete
rm -f *.html
find docs -name '*.html' -not -name 'quickref.html' -delete
- rm -rf docutils.egg-info extras/docutils.egg-info
+ rm -rf docutils.egg-info
cd test && rm -rf alltests.out record.txt functional/output/*/ functional/output/[a-z]*.*
dh_clean
@@ -97,8 +97,7 @@
: # tools, because their executable name goes into the --help output)
mkdir -p debian/tmp/man/
set -ex && for exe in $(filter-out rst2odt_prepstyles,$(scripts)); do \
- PYTHONPATH=.:extras; \
- export PYTHONPATH; \
+ export PYTHONPATH=.; \
cp debian/$$exe.txt debian/tmp/man/$$exe.txt; \
python debian/tmp/usr/share/docutils/scripts/python2/$$exe --help | \
sed \
@@ -111,7 +110,7 @@
python tools/rst2man.py debian/tmp/man/$$exe.txt \
debian/tmp/man/$$exe.1; \
done
- PYTHONPATH=.:extras python tools/rst2man.py debian/rst2odt_prepstyles.txt \
+ PYTHONPATH=. python tools/rst2man.py debian/rst2odt_prepstyles.txt \
debian/tmp/man/rst2odt_prepstyles.1
sed -i -e 's,"\(docutils/writers/\),"/usr/share/\1,g' debian/tmp/man/*
@@ -125,8 +124,8 @@
dh_install -p docutils-common -X /scripts/
dh_install -N docutils-common
dh_lintian
- dh_pysupport -p python-docutils -p python-roman
- dh_python3 -p python3-docutils -p python3-roman
+ dh_pysupport -p python-docutils
+ dh_python3 -p python3-docutils
dh_installexamples
dh_installcatalogs
dh_installxmlcatalogs
More information about the Python-modules-commits
mailing list