[Python-modules-commits] r15278 - in packages/sphinx/branches/1.0/debian (4 files)

[jwilk at users.alioth.debian.org]

    Date: Monday, January 10, 2011 @ 12:44:08
  Author: jwilk
Revision: 15278

Move ext/autosummary/templates/* out of /usr/share/pyshared/.

Modified:
  packages/sphinx/branches/1.0/debian/changelog
  packages/sphinx/branches/1.0/debian/dirs
  packages/sphinx/branches/1.0/debian/patches/move_static_files_outside_site-packages.patch
  packages/sphinx/branches/1.0/debian/rules

Modified: packages/sphinx/branches/1.0/debian/changelog
===================================================================
--- packages/sphinx/branches/1.0/debian/changelog	2011-01-10 12:29:58 UTC (rev 15277)
+++ packages/sphinx/branches/1.0/debian/changelog	2011-01-10 12:44:08 UTC (rev 15278)
@@ -1,8 +1,9 @@
 sphinx (1.0.6-2) UNRELEASED; urgency=low
 
-  * Move Grammar.txt out of /usr/share/pyshared/.
+  * Move pycode/Grammar.txt and ext/autosummary/templates/* out of
+    /usr/share/pyshared/ (closes: #609486).
 
- -- Jakub Wilk <jwilk at debian.org>  Mon, 10 Jan 2011 13:28:37 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Mon, 10 Jan 2011 13:42:26 +0100
 
 sphinx (1.0.6-1) experimental; urgency=low
 

Modified: packages/sphinx/branches/1.0/debian/dirs
===================================================================
--- packages/sphinx/branches/1.0/debian/dirs	2011-01-10 12:29:58 UTC (rev 15277)
+++ packages/sphinx/branches/1.0/debian/dirs	2011-01-10 12:44:08 UTC (rev 15278)
@@ -1,2 +1,3 @@
 /usr/share/sphinx/locale
 /usr/share/sphinx/pycode
+/usr/share/sphinx/ext/autosummary

Modified: packages/sphinx/branches/1.0/debian/patches/move_static_files_outside_site-packages.patch
===================================================================
--- packages/sphinx/branches/1.0/debian/patches/move_static_files_outside_site-packages.patch	2011-01-10 12:29:58 UTC (rev 15277)
+++ packages/sphinx/branches/1.0/debian/patches/move_static_files_outside_site-packages.patch	2011-01-10 12:44:08 UTC (rev 15278)
@@ -47,3 +47,22 @@
  pygrammar = driver.load_grammar(_grammarfile)
  pydriver = driver.Driver(pygrammar, convert=nodes.convert)
  
+--- a/sphinx/ext/autosummary/generate.py
++++ b/sphinx/ext/autosummary/generate.py
+@@ -26,6 +26,7 @@
+ from jinja2 import FileSystemLoader, TemplateNotFound
+ from jinja2.sandbox import SandboxedEnvironment
+ 
++from sphinx import package_dir
+ from sphinx.ext.autosummary import import_by_name, get_documenter
+ from sphinx.jinja2glue import BuiltinTemplateLoader
+ from sphinx.util.osutil import ensuredir
+@@ -76,7 +77,7 @@
+         sources = [os.path.join(base_path, filename) for filename in sources]
+ 
+     # create our own templating environment
+-    template_dirs = [os.path.join(os.path.dirname(__file__), 'templates')]
++    template_dirs = [os.path.join(package_dir, 'ext', 'autosummary', 'templates')]
+     if builder is not None:
+         # allow the user to override the templates
+         template_loader = BuiltinTemplateLoader()

Modified: packages/sphinx/branches/1.0/debian/rules
===================================================================
--- packages/sphinx/branches/1.0/debian/rules	2011-01-10 12:29:58 UTC (rev 15277)
+++ packages/sphinx/branches/1.0/debian/rules	2011-01-10 12:44:08 UTC (rev 15278)
@@ -39,6 +39,7 @@
 	mv $(SITE_PACKAGES_DIR)/sphinx/texinputs $(PACKAGE_DIR)/usr/share/sphinx/
 	mv $(SITE_PACKAGES_DIR)/sphinx/themes $(PACKAGE_DIR)/usr/share/sphinx/
 	mv $(SITE_PACKAGES_DIR)/sphinx/pycode/Grammar.txt $(PACKAGE_DIR)/usr/share/sphinx/pycode/
+	mv $(SITE_PACKAGES_DIR)/sphinx/ext/autosummary/templates $(PACKAGE_DIR)/usr/share/sphinx/ext/autosummary/
 	for lang in `find $(SITE_PACKAGES_DIR)/sphinx/locale\
 		-maxdepth 1 -mindepth 1 -type d -printf "%f "`;\
 	do\