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

[jwilk at users.alioth.debian.org]

    Date: Monday, January 10, 2011 @ 12:29:58
  Author: jwilk
Revision: 15277

Move Grammar.txt 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-09 15:19:08 UTC (rev 15276)
+++ packages/sphinx/branches/1.0/debian/changelog	2011-01-10 12:29:58 UTC (rev 15277)
@@ -1,3 +1,9 @@
+sphinx (1.0.6-2) UNRELEASED; urgency=low
+
+  * Move Grammar.txt out of /usr/share/pyshared/.
+
+ -- Jakub Wilk <jwilk at debian.org>  Mon, 10 Jan 2011 13:28:37 +0100
+
 sphinx (1.0.6-1) experimental; urgency=low
 
   * New upstream release.

Modified: packages/sphinx/branches/1.0/debian/dirs
===================================================================
--- packages/sphinx/branches/1.0/debian/dirs	2011-01-09 15:19:08 UTC (rev 15276)
+++ packages/sphinx/branches/1.0/debian/dirs	2011-01-10 12:29:58 UTC (rev 15277)
@@ -1 +1,2 @@
 /usr/share/sphinx/locale
+/usr/share/sphinx/pycode

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-09 15:19:08 UTC (rev 15276)
+++ packages/sphinx/branches/1.0/debian/patches/move_static_files_outside_site-packages.patch	2011-01-10 12:29:58 UTC (rev 15277)
@@ -1,7 +1,7 @@
 Description: Move static files outside site-packages so that they can be shared
   between different Python versions.
 Forwarded: not-needed
-Last-Update: 2010-12-18
+Last-Update: 2011-01-10
 
 --- a/sphinx/__init__.py
 +++ b/sphinx/__init__.py
@@ -28,3 +28,22 @@
  
  try:
      import nose
+--- a/sphinx/pycode/__init__.py
++++ b/sphinx/pycode/__init__.py
+@@ -14,6 +14,7 @@
+ from os import path
+ from cStringIO import StringIO
+ 
++from sphinx import package_dir
+ from sphinx.errors import PycodeError
+ from sphinx.pycode import nodes
+ from sphinx.pycode.pgen2 import driver, token, tokenize, parse, literals
+@@ -22,7 +23,7 @@
+ 
+ 
+ # load the Python grammar
+-_grammarfile = path.join(path.dirname(__file__), 'Grammar.txt')
++_grammarfile = path.join(package_dir, 'pycode', 'Grammar.txt')
+ pygrammar = driver.load_grammar(_grammarfile)
+ pydriver = driver.Driver(pygrammar, convert=nodes.convert)
+ 

Modified: packages/sphinx/branches/1.0/debian/rules
===================================================================
--- packages/sphinx/branches/1.0/debian/rules	2011-01-09 15:19:08 UTC (rev 15276)
+++ packages/sphinx/branches/1.0/debian/rules	2011-01-10 12:29:58 UTC (rev 15277)
@@ -38,6 +38,7 @@
 	# move static files outside {site,dist}-packages
 	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/
 	for lang in `find $(SITE_PACKAGES_DIR)/sphinx/locale\
 		-maxdepth 1 -mindepth 1 -type d -printf "%f "`;\
 	do\