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

Sat Jul 26 10:07:56 UTC 2014

Date: Saturday, July 26, 2014 @ 10:07:55
  Author: mitya57-guest
Revision: 29931

* New upstream release.
* Drop python3.3-odt-writer.diff, applied upstream.
* Drop test_nodes-2to3.diff, applied upstream.
* Update debian/watch to watch PyPI, which is more reliable
  than sf.php.

Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/patches/doc-debian-paths.diff
  packages/python-docutils/trunk/debian/patches/series
  packages/python-docutils/trunk/debian/watch
Deleted:
  packages/python-docutils/trunk/debian/patches/python3.3-odt-writer.diff
  packages/python-docutils/trunk/debian/patches/test_nodes-2to3.diff

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================

--- packages/python-docutils/trunk/debian/changelog	2014-07-26 09:17:38 UTC (rev 29930)
+++ packages/python-docutils/trunk/debian/changelog	2014-07-26 10:07:55 UTC (rev 29931)
@@ -1,8 +1,13 @@
-python-docutils (0.11-4) UNRELEASED; urgency=medium
+python-docutils (0.12-1) UNRELEASED; urgency=medium
 
+  * New upstream release.
+  * Drop python3.3-odt-writer.diff, applied upstream.
+  * Drop test_nodes-2to3.diff, applied upstream.
+  * Update debian/watch to watch PyPI, which is more reliable
+    than sf.php.
   * Add explicit build-dependency on dh-python.
 
- -- Dmitry Shachnev <mitya57 at gmail.com>  Sun, 12 Jan 2014 12:54:33 +0400
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Sat, 26 Jul 2014 13:59:54 +0400
 
 python-docutils (0.11-3) unstable; urgency=low
 

Modified: packages/python-docutils/trunk/debian/patches/doc-debian-paths.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/doc-debian-paths.diff	2014-07-26 09:17:38 UTC (rev 29930)
+++ packages/python-docutils/trunk/debian/patches/doc-debian-paths.diff	2014-07-26 10:07:55 UTC (rev 29931)
@@ -4,7 +4,7 @@
  name.
 Author: Simon McVittie <smcv at debian.org>
 Forwarded: not-needed
-Last-Update: 2013-08-03
+Last-Update: 2014-07-26
 
 --- a/README.txt
 +++ b/README.txt
@@ -43,18 +43,6 @@
  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).
---- a/docs/user/emacs.txt
-+++ b/docs/user/emacs.txt
-@@ -120,6 +120,9 @@
- 
-   (add-hook 'rst-adjust-hook 'rst-toc-update)
- 
-+The Debian ``python-docutils`` package automatically sets up a suitable
-+configuration.
-+
- Additional configuration variables can be customized and can be found
- by browsing the source code for ``rst.el``.
- 
 --- a/docs/user/tools.txt
 +++ b/docs/user/tools.txt
 @@ -39,6 +39,10 @@

Deleted: packages/python-docutils/trunk/debian/patches/python3.3-odt-writer.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/python3.3-odt-writer.diff	2014-07-26 09:17:38 UTC (rev 29930)
+++ packages/python-docutils/trunk/debian/patches/python3.3-odt-writer.diff	2014-07-26 10:07:55 UTC (rev 29931)
@@ -1,37 +0,0 @@
-Description: port the ODT writer to Python 3.3 ElementTree API
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: yes
-Bug: http://sourceforge.net/p/docutils/bugs/200/
-Bug-Debian: http://bugs.debian.org/692285
-Last-Update: 2013-05-16
-
---- a/docutils/writers/odf_odt/__init__.py
-+++ b/docutils/writers/odf_odt/__init__.py
-@@ -88,16 +88,20 @@
- #   that support for the ability to get the parent of an element.
- #
- if WhichElementTree == 'elementtree':
--    class _ElementInterfaceWrapper(etree._ElementInterface):
-+    import weakref
-+    _parents = weakref.WeakKeyDictionary()
-+    if isinstance(etree.Element, type):
-+        _ElementInterface = etree.Element
-+    else:
-+        _ElementInterface = etree._ElementInterface
-+    class _ElementInterfaceWrapper(_ElementInterface):
-         def __init__(self, tag, attrib=None):
--            etree._ElementInterface.__init__(self, tag, attrib)
--            if attrib is None:
--                attrib = {}
--            self.parent = None
-+            _ElementInterface.__init__(self, tag, attrib)
-+            _parents[self] = None
-         def setparent(self, parent):
--            self.parent = parent
-+            _parents[self] = parent
-         def getparent(self):
--            return self.parent
-+            return _parents[self]
- 
- 
- #

Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series	2014-07-26 09:17:38 UTC (rev 29930)
+++ packages/python-docutils/trunk/debian/patches/series	2014-07-26 10:07:55 UTC (rev 29931)
@@ -1,5 +1,4 @@
 python3-pil-no-bytestrings.diff
-python3.3-odt-writer.diff
 iepngfix-license.diff
 doc-debian-paths.diff
 emacs-sensible-browser.diff
@@ -11,4 +10,3 @@
 no-local-roman.diff
 rst2odt_prepstyles-elementtree.diff
 odt-writer-ascii-filenames.diff
-test_nodes-2to3.diff

Deleted: packages/python-docutils/trunk/debian/patches/test_nodes-2to3.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/test_nodes-2to3.diff	2014-07-26 09:17:38 UTC (rev 29930)
+++ packages/python-docutils/trunk/debian/patches/test_nodes-2to3.diff	2014-07-26 10:07:55 UTC (rev 29931)
@@ -1,25 +0,0 @@
-Description: Make ElementTests.test_empty pass in the test_nodes.py 2to3 conversion
- A bug in former versions of 2to3 has caused \uXXXX escapes in str
- literals, which are not interpreted as such in Python 2, to end up as
- the corresponding (actually interpreted) \uXXXX sequence in the
- resulting Python 3 code (see http://bugs.python.org/issue18037).
- test_nodes.ElementTests.test_empty relies on this behavior.
- .
- Fix the issue by using a Unicode literal in the Python 2 code.  This
- solution has been suggested by Jakub Wilk.
-Author: Michael Schutte <michi at debian.org>
-Forwarded: https://sourceforge.net/p/docutils/patches/115/
-Bug-Debian: http://bugs.debian.org/732679
-Last-Update: 2013-12-21
-
---- a/test/test_nodes.py
-+++ b/test/test_nodes.py
-@@ -92,7 +92,7 @@
-         if sys.version_info < (3,):
-             self.assertEqual(str(element), '<Element mark="\\u2022"/>')
-         else:
--            self.assertEqual(str(element), '<Element mark="\u2022"/>')
-+            self.assertEqual(str(element), u'<Element mark="\u2022"/>')
-         dom = element.asdom()
-         self.assertEqual(dom.toxml(), u'<Element mark="\u2022"/>')
-         dom.unlink()

Modified: packages/python-docutils/trunk/debian/watch
===================================================================
--- packages/python-docutils/trunk/debian/watch	2014-07-26 09:17:38 UTC (rev 29930)
+++ packages/python-docutils/trunk/debian/watch	2014-07-26 10:07:55 UTC (rev 29931)
@@ -1,6 +1,4 @@
 version=3
 
 opts=filenamemangle=s/(.*)/python-$1/ \
-http://sf.net/docutils/docutils-(.*)\.tar\.gz
-
-
+https://pypi.python.org/packages/source/d/docutils/docutils-(.*)\.tar\.gz


