[Python-modules-commits] r23178 - in packages/python-docutils/trunk/debian (8 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Tue Dec 18 20:59:19 UTC 2012
Date: Tuesday, December 18, 2012 @ 20:59:16
Author: jwilk
Revision: 23178
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/patches/emacs-sensible-browser.diff
packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff
packages/python-docutils/trunk/debian/patches/series
Deleted:
packages/python-docutils/trunk/debian/patches/deterministic-setotherlanguages.diff
packages/python-docutils/trunk/debian/patches/python3.3-import-compat.diff
Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog 2012-12-18 19:46:46 UTC (rev 23177)
+++ packages/python-docutils/trunk/debian/changelog 2012-12-18 20:59:16 UTC (rev 23178)
@@ -1,9 +1,15 @@
-python-docutils (0.9.1-3) UNRELEASED; urgency=low
+python-docutils (0.10-1) UNRELEASED; urgency=low
+ * New upstream release.
+ + Drop deterministic-setotherlanguages.diff, applied upstream.
+ + Drop python3.3-import-compat.diff, applied upstream.
+ + Refresh other patches.
+ + Update debian/copyright.
+ + Bump minimum required Python version to 2.4.
* DEP-8 tests: remove “Features: no-build-neededâ€; it's the default now.
* Bump standards version to 3.9.4; no changes needed.
- -- Jakub Wilk <jwilk at debian.org> Tue, 13 Nov 2012 22:35:19 +0100
+ -- Jakub Wilk <jwilk at debian.org> Tue, 18 Dec 2012 21:33:28 +0100
python-docutils (0.9.1-2) experimental; urgency=low
Modified: packages/python-docutils/trunk/debian/control
===================================================================
--- packages/python-docutils/trunk/debian/control 2012-12-18 19:46:46 UTC (rev 23177)
+++ packages/python-docutils/trunk/debian/control 2012-12-18 20:59:16 UTC (rev 23178)
@@ -7,13 +7,13 @@
Michael Schutte <michi at uiae.at>,
Ben Finney <ben+debian at benfinney.id.au>
Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: python-all (>= 2.3),
+Build-Depends-Indep: python-all (>= 2.4),
python3-all (>= 3.1.2-7~),
python-support (>= 0.6.4),
python-roman, python3-roman,
xml-core
Standards-Version: 3.9.4
-XS-Python-Version: >= 2.3
+XS-Python-Version: >= 2.4
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-docutils/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-docutils/trunk/
Homepage: http://docutils.sourceforge.net/
Modified: packages/python-docutils/trunk/debian/copyright
===================================================================
--- packages/python-docutils/trunk/debian/copyright 2012-12-18 19:46:46 UTC (rev 23177)
+++ packages/python-docutils/trunk/debian/copyright 2012-12-18 20:59:16 UTC (rev 23178)
@@ -30,9 +30,9 @@
The primary repository for the Work is the Internet World Wide Web
site <http://docutils.sourceforge.net/>. The Work consists of the
files within the "docutils" module of the Docutils project Subversion
-repository (Internet host svn.berlios.de, filesystem path
-/svnroot/repos/docutils), whose Internet web interface is located at
-<http://svn.berlios.de/viewcvs/docutils/>. Files dedicated to the
+repository (Internet host docutils.svn.sourceforge.net, filesystem path
+/svnroot/docutils), whose Internet web interface is located at
+<http://docutils.svn.sourceforge.net/viewvc/docutils/>. Files dedicated to the
public domain may be identified by the inclusion, near the beginning
of each file, of a declaration of the form::
@@ -55,9 +55,19 @@
that have not yet been invented or conceived.
(This dedication is derived from the text of the `Creative Commons
-Public Domain Dedication
-<http://creativecommons.org/licenses/publicdomain>`_.)
+Public Domain Dedication`. [#]_)
+.. [#] Creative Commons has `retired this legal tool`__ and does not
+ recommend that it be applied to works: This tool is based on United
+ States law and may not be applicable outside the US. For dedicating new
+ works to the public domain, Creative Commons recommend the replacement
+ Public Domain Dedication CC0_ (CC zero, "No Rights Reserved"). So does
+ the Free Software Foundation in its license-list_.
+
+ __ http://creativecommons.org/retiredlicenses
+ .. _CC0: http://creativecommons.org/about/cc0
+ .. _license-list: http://www.gnu.org/licenses/license-list.html
+
Exceptions
==========
@@ -73,12 +83,13 @@
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/utils/math/__init__.py,
+ docutils/utils/math/latex2mathml.py,
docutils/writers/xetex/__init__.py,
- docutils/error_reporting.py,
docutils/writers/latex2e/docutils-05-compat.sty,
- docs/user/docutils-05-compat.sty.txt:
+ docs/user/docutils-05-compat.sty.txt,
+ docutils/utils/error_reporting.py,
+ docutils/test/transforms/test_smartquotes.py:
Copyright © Günter Milde
@@ -107,7 +118,46 @@
(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/utils/smartquotes.py
+
+ Copyright © 2011 Günter Milde,
+ based on `SmartyPants`_ © 2003 John Gruber
+ and smartypants.py © 2004, 2007 Chad Miller.
+
+ The original code was released under the terms of the 3-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.
+
+ * Neither the name "SmartyPants" nor the names of its contributors
+ may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+ 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.
+
+
+ .. _SmartyPants: http://daringfireball.net/projects/smartypants/
+
+* docutils/utils/math/math2html.py,
docutils/writers/html4css1/math.css
Copyright © Alex Fernández
@@ -401,9 +451,9 @@
| ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
| OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-* tools/editors/emacs/rst.el:
+* tools/editors/emacs/:
- Copyright © 2003-2011 Free Software Foundation, Inc.
+ Copyright © 2003-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
Deleted: packages/python-docutils/trunk/debian/patches/deterministic-setotherlanguages.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/deterministic-setotherlanguages.diff 2012-12-18 19:46:46 UTC (rev 23177)
+++ packages/python-docutils/trunk/debian/patches/deterministic-setotherlanguages.diff 2012-12-18 20:59:16 UTC (rev 23178)
@@ -1,36 +0,0 @@
-Description: make order of languages in \setotherlanguages deterministic
-Origin: upstream, http://docutils.svn.sourceforge.net/viewvc/docutils?view=revision&revision=7492
-
---- a/docutils/writers/latex2e/__init__.py
-+++ b/docutils/writers/latex2e/__init__.py
-@@ -384,7 +384,7 @@
-
- def __call__(self):
- """Return the babel call with correct options and settings"""
-- languages = self.otherlanguages.keys()
-+ languages = sorted(self.otherlanguages.keys())
- languages.append(self.language or 'english')
- self.setup = [r'\usepackage[%s]{babel}' % ','.join(languages)]
- if 'spanish' in languages:
---- a/docutils/writers/xetex/__init__.py
-+++ b/docutils/writers/xetex/__init__.py
-@@ -118,7 +118,7 @@
- r'\setdefaultlanguage{%s}' % self.language]
- if self.otherlanguages:
- setup.append(r'\setotherlanguages{%s}' %
-- ','.join(self.otherlanguages.keys()))
-+ ','.join(sorted(self.otherlanguages.keys())))
- return '\n'.join(setup)
-
-
---- a/test/functional/expected/standalone_rst_xetex.tex
-+++ b/test/functional/expected/standalone_rst_xetex.tex
-@@ -7,7 +7,7 @@
- \usepackage{amsmath}
- \usepackage{polyglossia}
- \setdefaultlanguage{english}
--\setotherlanguages{german,british,french}
-+\setotherlanguages{british,french,german}
- \usepackage{color}
- \usepackage{float} % float configuration
- \floatplacement{figure}{H} % place figures here definitely
Modified: packages/python-docutils/trunk/debian/patches/emacs-sensible-browser.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/emacs-sensible-browser.diff 2012-12-18 19:46:46 UTC (rev 23177)
+++ packages/python-docutils/trunk/debian/patches/emacs-sensible-browser.diff 2012-12-18 20:59:16 UTC (rev 23178)
@@ -7,7 +7,7 @@
--- a/tools/editors/emacs/rst.el
+++ b/tools/editors/emacs/rst.el
-@@ -4070,7 +4070,7 @@
+@@ -4032,7 +4032,7 @@
))
;; FIXME: Should be `defcustom` or use something like `browse-url`.
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-12-18 19:46:46 UTC (rev 23177)
+++ packages/python-docutils/trunk/debian/patches/move-data-to-usr-share.diff 2012-12-18 20:59:16 UTC (rev 23178)
@@ -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
-@@ -46,7 +47,7 @@
+ from docutils.utils.error_reporting import SafeString, ErrorString
+ from docutils.utils.error_reporting import locale_encoding
+@@ -47,7 +48,7 @@
'class': directives.class_option,
'name': directives.unchanged}
@@ -48,9 +48,9 @@
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.utils.error_reporting import SafeString
from docutils.transforms import writer_aux
-@@ -39,7 +40,7 @@
+@@ -34,7 +35,7 @@
"""Formats this writer supports."""
default_template = 'default.tex'
@@ -61,7 +61,7 @@
r'\usepackage{mathptmx} % Times',
--- a/docutils/writers/odf_odt/__init__.py
+++ b/docutils/writers/odf_odt/__init__.py
-@@ -397,13 +397,13 @@
+@@ -395,13 +395,13 @@
default_stylesheet_path = utils.relative_path(
os.path.join(os.getcwd(), 'dummy'),
@@ -108,7 +108,7 @@
# Where else to look for a theme?
--- a/docutils/__init__.py
+++ b/docutils/__init__.py
-@@ -212,3 +212,18 @@
+@@ -215,3 +215,18 @@
a certain input context or output format.
"""
return format in self.supported
Deleted: packages/python-docutils/trunk/debian/patches/python3.3-import-compat.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/python3.3-import-compat.diff 2012-12-18 19:46:46 UTC (rev 23177)
+++ packages/python-docutils/trunk/debian/patches/python3.3-import-compat.diff 2012-12-18 20:59:16 UTC (rev 23178)
@@ -1,172 +0,0 @@
-Description: use relative __import__ with Python ≥ 3.3
- In Python ≥ 3.3, the __import__() function uses absolute imports by
- default; in previous versions it attempted both absolute and relative
- imports, which is what Docutils expected.
- .
- This patch fixes the code to explicitly use relative imports.
-Origin: upstream, http://docutils.svn.sourceforge.net/viewvc/docutils?view=revision&revision=7486
-Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=3541369&group_id=38414&atid=422030
-Bug-Debian: http://bugs.debian.org/681723
-
---- a/docutils/_compat.py
-+++ b/docutils/_compat.py
-@@ -35,3 +35,14 @@
- # using this hack since 2to3 "fixes" the relative import
- # when using ``from io import BytesIO``
- BytesIO = __import__('io').BytesIO
-+
-+if sys.version_info < (2,5):
-+ import __builtin__
-+
-+ def __import__(name, globals={}, locals={}, fromlist=[], level=-1):
-+ """Compatibility definition for Python 2.4.
-+
-+ Silently ignore the `level` argument missing in Python < 2.5.
-+ """
-+ # we need the level arg because the default changed in Python 3.3
-+ return __builtin__.__import__(name, globals, locals, fromlist)
---- a/docutils/languages/__init__.py
-+++ b/docutils/languages/__init__.py
-@@ -11,7 +11,11 @@
-
- __docformat__ = 'reStructuredText'
-
-+import sys
-+
- from docutils.utils import normalize_language_tag
-+if sys.version_info < (2,5):
-+ from docutils._compat import __import__
-
- _languages = {}
-
-@@ -26,7 +30,7 @@
- if tag in _languages:
- return _languages[tag]
- try:
-- module = __import__(tag, globals(), locals())
-+ module = __import__(tag, globals(), locals(), level=1)
- except ImportError:
- continue
- _languages[tag] = module
-@@ -35,6 +39,6 @@
- reporter.warning(
- 'language "%s" not supported: ' % language_code +
- 'Docutils-generated text will be in English.')
-- module = __import__('en', globals(), locals())
-+ module = __import__('en', globals(), locals(), level=1)
- _languages[tag] = module # warn only one time!
- return module
---- a/docutils/parsers/__init__.py
-+++ b/docutils/parsers/__init__.py
-@@ -8,7 +8,10 @@
-
- __docformat__ = 'reStructuredText'
-
-+import sys
- from docutils import Component
-+if sys.version_info < (2,5):
-+ from docutils._compat import __import__
-
-
- class Parser(Component):
-@@ -43,5 +46,5 @@
- parser_name = parser_name.lower()
- if parser_name in _parser_aliases:
- parser_name = _parser_aliases[parser_name]
-- module = __import__(parser_name, globals(), locals())
-+ module = __import__(parser_name, globals(), locals(), level=1)
- return module.Parser
---- a/docutils/parsers/rst/directives/__init__.py
-+++ b/docutils/parsers/rst/directives/__init__.py
-@@ -10,8 +10,12 @@
-
- import re
- import codecs
-+import sys
-+
- from docutils import nodes
- from docutils.parsers.rst.languages import en as _fallback_language_module
-+if sys.version_info < (2,5):
-+ from docutils._compat import __import__
-
-
- _directive_registry = {
-@@ -109,7 +113,7 @@
- # Error handling done by caller.
- return None, messages
- try:
-- module = __import__(modulename, globals(), locals())
-+ module = __import__(modulename, globals(), locals(), level=1)
- except ImportError, detail:
- messages.append(document.reporter.error(
- 'Error importing directive module "%s" (directive "%s"):\n%s'
---- a/docutils/parsers/rst/languages/__init__.py
-+++ b/docutils/parsers/rst/languages/__init__.py
-@@ -12,7 +12,11 @@
-
- __docformat__ = 'reStructuredText'
-
-+import sys
-+
- from docutils.utils import normalize_language_tag
-+if sys.version_info < (2,5):
-+ from docutils._compat import __import__
-
- _languages = {}
-
-@@ -21,7 +25,7 @@
- if tag in _languages:
- return _languages[tag]
- try:
-- module = __import__(tag, globals(), locals())
-+ module = __import__(tag, globals(), locals(), level=1)
- except ImportError:
- continue
- _languages[tag] = module
---- a/docutils/readers/__init__.py
-+++ b/docutils/readers/__init__.py
-@@ -8,9 +8,12 @@
-
- __docformat__ = 'reStructuredText'
-
-+import sys
-
- from docutils import utils, parsers, Component
- from docutils.transforms import universal
-+if sys.version_info < (2,5):
-+ from docutils._compat import __import__
-
-
- class Reader(Component):
-@@ -103,5 +106,5 @@
- reader_name = reader_name.lower()
- if reader_name in _reader_aliases:
- reader_name = _reader_aliases[reader_name]
-- module = __import__(reader_name, globals(), locals())
-+ module = __import__(reader_name, globals(), locals(), level=1)
- return module.Reader
---- a/docutils/writers/__init__.py
-+++ b/docutils/writers/__init__.py
-@@ -8,11 +8,14 @@
-
- __docformat__ = 'reStructuredText'
-
--
- import os.path
-+import sys
-+
- import docutils
- from docutils import languages, Component
- from docutils.transforms import universal
-+if sys.version_info < (2,5):
-+ from docutils._compat import __import__
-
-
- class Writer(Component):
-@@ -130,5 +133,5 @@
- writer_name = writer_name.lower()
- if writer_name in _writer_aliases:
- writer_name = _writer_aliases[writer_name]
-- module = __import__(writer_name, globals(), locals())
-+ module = __import__(writer_name, globals(), locals(), level=1)
- return module.Writer
Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series 2012-12-18 19:46:46 UTC (rev 23177)
+++ packages/python-docutils/trunk/debian/patches/series 2012-12-18 20:59:16 UTC (rev 23178)
@@ -1,5 +1,3 @@
-python3.3-import-compat.diff
-deterministic-setotherlanguages.diff
iepngfix-license.diff
doc-debian-paths.diff
emacs-sensible-browser.diff
More information about the Python-modules-commits
mailing list