[Python-modules-commits] r18932 - in packages/sphinx/branches/1.1/debian (2 files)

[jwilk at users.alioth.debian.org]

    Date: Saturday, October 15, 2011 @ 13:40:46
  Author: jwilk
Revision: 18932

Update move_static_files_outside_site-packages.patch to take care of sphinx.websupport.

Modified:
  packages/sphinx/branches/1.1/debian/changelog
  packages/sphinx/branches/1.1/debian/patches/move_static_files_outside_site-packages.patch

Modified: packages/sphinx/branches/1.1/debian/changelog
===================================================================
--- packages/sphinx/branches/1.1/debian/changelog	2011-10-15 13:25:38 UTC (rev 18931)
+++ packages/sphinx/branches/1.1/debian/changelog	2011-10-15 13:40:46 UTC (rev 18932)
@@ -4,6 +4,8 @@
     + Drop autosummary_1.0.6.patch for the time being (reopens: #611078).
     + Drop docstring_parse.diff, applied upstream.
     + Rename disable_ez_setup.diff to disable_distribute_setup.diff.
+    + Update move_static_files_outside_site-packages.patch to take care of
+      sphinx.websupport.
     + Refresh other patches.
     + Update integration tests for the JavaScript code.
     + Bump minimum required versions:
@@ -40,7 +42,7 @@
   * Use a for loop in debian/rules to install all sphinx-* scripts.
   * Use ‘set -x’ for all for loops in debian/rules.
 
- -- Jakub Wilk <jwilk at debian.org>  Sat, 15 Oct 2011 15:03:43 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 15 Oct 2011 15:39:46 +0200
 
 sphinx (1.0.8+dfsg-2) unstable; urgency=low
 

Modified: packages/sphinx/branches/1.1/debian/patches/move_static_files_outside_site-packages.patch
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/move_static_files_outside_site-packages.patch	2011-10-15 13:25:38 UTC (rev 18931)
+++ packages/sphinx/branches/1.1/debian/patches/move_static_files_outside_site-packages.patch	2011-10-15 13:40:46 UTC (rev 18932)
@@ -66,3 +66,14 @@
      if builder is not None:
          # allow the user to override the templates
          template_loader = BuiltinTemplateLoader()
+--- a/sphinx/websupport/__init__.py
++++ b/sphinx/websupport/__init__.py
+@@ -87,7 +87,7 @@
+ 
+     def _init_templating(self):
+         import sphinx
+-        template_path = path.join(path.dirname(sphinx.__file__),
++        template_path = path.join(sphinx.package_dir,
+                                   'themes', 'basic')
+         loader = FileSystemLoader(template_path)
+         self.template_env = Environment(loader=loader)