[Python-modules-commits] r30550 - in packages/sphinx/trunk/debian (4 files)

[mitya57-guest at users.alioth.debian.org]

    Date: Tuesday, September 9, 2014 @ 06:15:02
  Author: mitya57-guest
Revision: 30550

* New upstream bugfix release.
* Drop websupport_todo.diff, applied upstream.

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/parallel_2to3.diff
  packages/sphinx/trunk/debian/patches/series
Deleted:
  packages/sphinx/trunk/debian/patches/websupport_todo.diff

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2014-09-08 22:06:09 UTC (rev 30549)
+++ packages/sphinx/trunk/debian/changelog	2014-09-09 06:15:02 UTC (rev 30550)
@@ -1,3 +1,10 @@
+sphinx (1.2.3+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream bugfix release.
+  * Drop websupport_todo.diff, applied upstream.
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 09 Sep 2014 10:06:21 +0400
+
 sphinx (1.2.2+dfsg-4) unstable; urgency=medium
 
   * Build-depend on python3-whoosh, now when it is available.

Modified: packages/sphinx/trunk/debian/patches/parallel_2to3.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/parallel_2to3.diff	2014-09-08 22:06:09 UTC (rev 30549)
+++ packages/sphinx/trunk/debian/patches/parallel_2to3.diff	2014-09-09 06:15:02 UTC (rev 30550)
@@ -5,7 +5,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -157,6 +157,23 @@
+@@ -158,6 +158,23 @@
  
      cmdclass['compile_catalog'] = compile_catalog_plusjs
  

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2014-09-08 22:06:09 UTC (rev 30549)
+++ packages/sphinx/trunk/debian/patches/series	2014-09-09 06:15:02 UTC (rev 30550)
@@ -4,4 +4,3 @@
 parallel_2to3.diff
 no_external_css.diff
 fix_latex_hlines.diff
-websupport_todo.diff

Deleted: packages/sphinx/trunk/debian/patches/websupport_todo.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/websupport_todo.diff	2014-09-08 22:06:09 UTC (rev 30549)
+++ packages/sphinx/trunk/debian/patches/websupport_todo.diff	2014-09-09 06:15:02 UTC (rev 30550)
@@ -1,15 +0,0 @@
-Description: make websupport work with todolist directives
-Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/commits/bb0211a65072
-Bug-Debian: https://bugs.debian.org/754408
-Last-Update: 2014-08-25
-
---- a/sphinx/writers/websupport.py
-+++ b/sphinx/writers/websupport.py
-@@ -23,7 +23,7 @@
-         self.comment_class = 'sphinx-has-comment'
- 
-     def dispatch_visit(self, node):
--        if is_commentable(node):
-+        if is_commentable(node) and hasattr(node, 'uid'):
-             self.handle_visit_commentable(node)
-         HTMLTranslator.dispatch_visit(self, node)