[Python-modules-commits] r13089 - in packages/sphinx/trunk/debian (3 files)

[piotr at users.alioth.debian.org]

    Date: Tuesday, May 25, 2010 @ 21:39:34
  Author: piotr
Revision: 13089

* New upstream release
* Minimum required versions bumped:
  - python-jinja2 >= 2.2
  - python-docutils >= 0.5
* move_static_files_outside_site-packages.patch updated

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/control
  packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2010-05-25 21:02:39 UTC (rev 13088)
+++ packages/sphinx/trunk/debian/changelog	2010-05-25 21:39:34 UTC (rev 13089)
@@ -1,3 +1,14 @@
+sphinx (1.0~b1-1) experimental; urgency=low
+
+  [ Piotr Ożarowski ]
+  * New upstream release
+  * Minimum required versions bumped:
+    - python-jinja2 >= 2.2
+    - python-docutils >= 0.5
+  * move_static_files_outside_site-packages.patch updated
+
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>  Tue, 25 May 2010 23:01:44 +0200
+
 sphinx (0.6.6-1) unstable; urgency=low
 
   [ Piotr Ożarowski ]

Modified: packages/sphinx/trunk/debian/control
===================================================================
--- packages/sphinx/trunk/debian/control	2010-05-25 21:02:39 UTC (rev 13088)
+++ packages/sphinx/trunk/debian/control	2010-05-25 21:39:34 UTC (rev 13089)
@@ -12,7 +12,7 @@
 
 Package: python-sphinx
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-docutils, python-pygments (>= 0.8), python-jinja2 (>= 2.1), libjs-jquery
+Depends: ${misc:Depends}, ${python:Depends}, python-docutils (>= 0.5), python-pygments (>= 0.8), python-jinja2 (>= 2.2), libjs-jquery
 Recommends: python (>= 2.6) | python-simplejson, python-imaging
 Suggests: jsmath
 Description: tool for producing documentation for Python projects

Modified: packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch
===================================================================
--- packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch	2010-05-25 21:02:39 UTC (rev 13088)
+++ packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch	2010-05-25 21:39:34 UTC (rev 13089)
@@ -1,41 +1,15 @@
 # move static files outside site-packages so that they can be shared between
 # different Python versions
---- a/sphinx/theming.py
-+++ b/sphinx/theming.py
-@@ -33,7 +33,7 @@
-     def init_themes(cls, builder):
-         """Search all theme paths for available themes."""
-         cls.themepath = list(builder.config.html_theme_path)
--        cls.themepath.append(path.join(package_dir, 'themes'))
-+        cls.themepath.append('/usr/share/sphinx/themes')
+Index: sphinx-1.0~b1/sphinx/__init__.py
+===================================================================
+--- sphinx-1.0~b1.orig/sphinx/__init__.py
++++ sphinx-1.0~b1/sphinx/__init__.py
+@@ -15,7 +15,7 @@ from os import path
+ __version__ = '1.0b1'
+ __released__ = '1.0b1'  # used when Sphinx builds its own docs
  
-         for themedir in cls.themepath[::-1]:
-             themedir = path.join(builder.confdir, themedir)
---- a/sphinx/builders/changes.py
-+++ b/sphinx/builders/changes.py
-@@ -136,12 +136,10 @@
-                 f.close()
-         themectx = dict(('theme_' + key, val) for (key, val) in
-                         self.theme.get_options({}).iteritems())
--        copy_static_entry(path.join(package_dir, 'themes', 'default',
--                                    'static', 'default.css_t'),
-+        copy_static_entry('/usr/share/sphinx/themes/default/static/default.css_t',
-                           path.join(self.outdir, 'default.css_t'),
-                           self, themectx)
--        copy_static_entry(path.join(package_dir, 'themes', 'basic',
--                                    'static', 'basic.css'),
-+        copy_static_entry('/usr/share/sphinx/themes/basic/static/basic.css',
-                           path.join(self.outdir, 'basic.css'), self)
+-package_dir = path.abspath(path.dirname(__file__))
++package_dir = '/usr/share/sphinx/'
  
-     def hl(self, text, version):
---- a/sphinx/builders/latex.py
-+++ b/sphinx/builders/latex.py
-@@ -194,7 +194,7 @@
-                      path.join(self.outdir, logobase))
- 
-         self.info(bold('copying TeX support files... '), nonl=True)
--        staticdirname = path.join(package_dir, 'texinputs')
-+        staticdirname = '/usr/share/sphinx/texinputs'
-         for filename in os.listdir(staticdirname):
-             if not filename.startswith('.'):
-                 copyfile(path.join(staticdirname, filename),
+ if '+' in __version__ or 'pre' in __version__:
+     # try to find out the changeset hash if checked out from hg, and append