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

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

    Date: Monday, January 20, 2014 @ 14:36:54
  Author: mitya57-guest
Revision: 27328

* New upstream release.
* Drop fix_jinja_recursion.diff, applied upstream.
* Drop unversioned_grammar_pickle.diff, a different fix was applied
  upstream.

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/series
Deleted:
  packages/sphinx/trunk/debian/patches/fix_jinja_recursion.diff
  packages/sphinx/trunk/debian/patches/unversioned_grammar_pickle.diff

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2014-01-20 14:28:51 UTC (rev 27327)
+++ packages/sphinx/trunk/debian/changelog	2014-01-20 14:36:54 UTC (rev 27328)
@@ -1,3 +1,12 @@
+sphinx (1.2.1+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Drop fix_jinja_recursion.diff, applied upstream.
+  * Drop unversioned_grammar_pickle.diff, a different fix was applied
+    upstream.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Mon, 20 Jan 2014 18:28:47 +0400
+
 sphinx (1.2+dfsg-2) unstable; urgency=medium
 
   * Backport upstream patch (fix_jinja_recursion.diff) to fix infinite

Deleted: packages/sphinx/trunk/debian/patches/fix_jinja_recursion.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_jinja_recursion.diff	2014-01-20 14:28:51 UTC (rev 27327)
+++ packages/sphinx/trunk/debian/patches/fix_jinja_recursion.diff	2014-01-20 14:36:54 UTC (rev 27328)
@@ -1,20 +0,0 @@
-Description: fix infinite recursion in BuiltinTemplateLoader in jinja2glue.py
-Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/commits/edcb9911521aa8
-Last-Update: 2013-12-27
-
---- a/sphinx/jinja2glue.py
-+++ b/sphinx/jinja2glue.py
-@@ -95,9 +95,11 @@
-             # then the theme parent paths
-             loaderchain = pathchain + theme.themepath
-         elif dirs:
--            pathchain = loaderchain = list(dirs)
-+            pathchain = list(dirs)
-+            loaderchain = list(dirs)
-         else:
--            pathchain = loaderchain = []
-+            pathchain = []
-+            loaderchain = []
- 
-         # prepend explicit template paths
-         self.templatepathlen = len(builder.config.templates_path)

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2014-01-20 14:28:51 UTC (rev 27327)
+++ packages/sphinx/trunk/debian/patches/series	2014-01-20 14:36:54 UTC (rev 27328)
@@ -1,8 +1,6 @@
 disable_distribute_setup.diff
-unversioned_grammar_pickle.diff
 initialize_autodoc.diff
 sphinxcontrib_namespace.diff
 python3_test_build_dir.diff
 parallel_2to3.diff
 no_external_css.diff
-fix_jinja_recursion.diff

Deleted: packages/sphinx/trunk/debian/patches/unversioned_grammar_pickle.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/unversioned_grammar_pickle.diff	2014-01-20 14:28:51 UTC (rev 27327)
+++ packages/sphinx/trunk/debian/patches/unversioned_grammar_pickle.diff	2014-01-20 14:36:54 UTC (rev 27328)
@@ -1,17 +0,0 @@
-Description: don't embed Python version in filename of grammar pickle
-Author: Jakub Wilk <jwilk at debian.org>
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/641
-Forwarded: not-needed
-Last-Update: 2011-02-16
-
---- a/sphinx/pycode/pgen2/driver.py
-+++ b/sphinx/pycode/pgen2/driver.py
-@@ -120,7 +120,7 @@
-         head, tail = os.path.splitext(gt)
-         if tail == ".txt":
-             tail = ""
--        gp = head + tail + ".".join(map(str, sys.version_info[:2])) + ".pickle"
-+        gp = head + tail + ".pickle"
-     if force or not _newer(gp, gt):
-         logger.info("Generating grammar tables from %s", gt)
-         g = pgen.generate_grammar(gt)