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

[jwilk at users.alioth.debian.org]

    Date: Friday, August 6, 2010 @ 14:32:40
  Author: jwilk
Revision: 14141

Undo r13089. Next version in unstable will be 0.6.6-2.

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

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2010-08-06 14:27:58 UTC (rev 14140)
+++ packages/sphinx/trunk/debian/changelog	2010-08-06 14:32:40 UTC (rev 14141)
@@ -1,20 +1,9 @@
-sphinx (1.0~b1-2) UNRELEASED; urgency=low
+sphinx (0.6.6-2) UNRELEASED; urgency=low
 
   * Fix preinst script to correctly remove python-central remnants (Closes: #559572).
 
  -- Mikhail Gusarov <dottedmag at dottedmag.net>  Thu, 24 Jun 2010 20:28:48 +0700
 
-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-08-06 14:27:58 UTC (rev 14140)
+++ packages/sphinx/trunk/debian/control	2010-08-06 14:32:40 UTC (rev 14141)
@@ -12,7 +12,7 @@
 
 Package: python-sphinx
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-docutils (>= 0.5), python-pygments (>= 0.8), python-jinja2 (>= 2.2), libjs-jquery
+Depends: ${misc:Depends}, ${python:Depends}, python-docutils, python-pygments (>= 0.8), python-jinja2 (>= 2.1), 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-08-06 14:27:58 UTC (rev 14140)
+++ packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch	2010-08-06 14:32:40 UTC (rev 14141)
@@ -1,15 +1,41 @@
 # move static files outside site-packages so that they can be shared between
 # different Python versions
-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
+--- 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')
  
--package_dir = path.abspath(path.dirname(__file__))
-+package_dir = '/usr/share/sphinx/'
+         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)
  
- if '+' in __version__ or 'pre' in __version__:
-     # try to find out the changeset hash if checked out from hg, and append
+     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),

Modified: packages/sphinx/trunk/debian/preinst
===================================================================
--- packages/sphinx/trunk/debian/preinst	2010-08-06 14:27:58 UTC (rev 14140)
+++ packages/sphinx/trunk/debian/preinst	2010-08-06 14:32:40 UTC (rev 14141)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # TODO: remove this file after releasing Squeeze
 set -e
-if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt-nl 1.0~b1-2~;
+if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt-nl 0.6.6-2~;
 then
 	pycentral pkgremove python-sphinx || true
 	rm -rf /usr/lib/python2.*/*-packages/sphinx/