[Python-modules-commits] r8795 - in packages/sphinx/trunk/debian (6 files)

[piotr at users.alioth.debian.org]

    Date: Wednesday, June 17, 2009 @ 17:56:39
  Author: piotr
Revision: 8795

* New upstream release
  - add_missing_sphinx-autogen and rfind-invocation patches removed, no
    longer needed
  - move_static_files_outside_site-packages.patch updated
* Standards-Version bumped to 3.8.2, no changes needed.

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/patches/series
Deleted:
  packages/sphinx/trunk/debian/patches/add_missing_sphinx-autogen.patch
  packages/sphinx/trunk/debian/patches/rfind-invocation.patch

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2009-06-17 14:23:46 UTC (rev 8794)
+++ packages/sphinx/trunk/debian/changelog	2009-06-17 17:56:39 UTC (rev 8795)
@@ -1,3 +1,14 @@
+sphinx (0.6.2-1) unstable; urgency=low
+
+  [ Piotr Ożarowski ]
+  * New upstream release
+    - add_missing_sphinx-autogen and rfind-invocation patches removed, no
+      longer needed
+    - move_static_files_outside_site-packages.patch updated
+  * Standards-Version bumped to 3.8.2, no changes needed.
+
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>  Wed, 17 Jun 2009 19:32:26 +0200
+
 sphinx (0.6.1-2) unstable; urgency=low
 
   [ Mikhail Gusarov ]

Modified: packages/sphinx/trunk/debian/control
===================================================================
--- packages/sphinx/trunk/debian/control	2009-06-17 14:23:46 UTC (rev 8794)
+++ packages/sphinx/trunk/debian/control	2009-06-17 17:56:39 UTC (rev 8795)
@@ -6,7 +6,7 @@
 Homepage: http://sphinx.pocoo.org/
 Build-Depends: debhelper (>= 7), python-all (>= 2.5.4-1~), python-setuptools (>= 0.6c5-1~), quilt (>= 0.40)
 Build-Depends-Indep: python-support (>= 0.6.4), python-docutils, python-pygments (>= 0.8), python-jinja2 (>= 2.1)
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 XS-Python-Version: >=2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sphinx/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sphinx/trunk/

Deleted: packages/sphinx/trunk/debian/patches/add_missing_sphinx-autogen.patch
===================================================================
--- packages/sphinx/trunk/debian/patches/add_missing_sphinx-autogen.patch	2009-06-17 14:23:46 UTC (rev 8794)
+++ packages/sphinx/trunk/debian/patches/add_missing_sphinx-autogen.patch	2009-06-17 17:56:39 UTC (rev 8795)
@@ -1,22 +0,0 @@
-file taken from upstream's hg repository
-(already added to MANIFEST.in so will be available in next tarball)
-Index: sphinx-0.6.1/sphinx-autogen.py
-===================================================================
---- /dev/null
-+++ sphinx-0.6.1/sphinx-autogen.py
-@@ -0,0 +1,15 @@
-+#!/usr/bin/env python
-+# -*- coding: utf-8 -*-
-+"""
-+    Sphinx - Python documentation toolchain
-+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+
-+    :copyright: 2007-2009 by Georg Brandl.
-+    :license: BSD.
-+"""
-+
-+import sys
-+
-+if __name__ == '__main__':
-+    from sphinx.ext.autosummary.generate import main
-+    sys.exit(main(sys.argv))

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	2009-06-17 14:23:46 UTC (rev 8794)
+++ packages/sphinx/trunk/debian/patches/move_static_files_outside_site-packages.patch	2009-06-17 17:56:39 UTC (rev 8795)
@@ -60,16 +60,3 @@
              if path.isfile(jsfile):
                  self.script_files.append('_static/translations.js')
  
-Index: sphinx-0.6.1/sphinx/builders/__init__.py
-===================================================================
---- sphinx-0.6.1.orig/sphinx/builders/__init__.py
-+++ sphinx-0.6.1/sphinx/builders/__init__.py
-@@ -176,7 +176,7 @@ class Builder(object):
-         if self.config.language is not None:
-             self.info(bold('loading translations [%s]... ' %
-                            self.config.language), nonl=True)
--            locale_dirs = [path.join(package_dir, 'locale')] + \
-+            locale_dirs = [path.join(package_dir, 'locale'), '/usr/share/locale'] + \
-                 [path.join(self.srcdir, x) for x in self.config.locale_dirs]
-             for dir_ in locale_dirs:
-                 try:

Deleted: packages/sphinx/trunk/debian/patches/rfind-invocation.patch
===================================================================
--- packages/sphinx/trunk/debian/patches/rfind-invocation.patch	2009-06-17 14:23:46 UTC (rev 8794)
+++ packages/sphinx/trunk/debian/patches/rfind-invocation.patch	2009-06-17 17:56:39 UTC (rev 8795)
@@ -1,14 +0,0 @@
-The patch below fixes the wrong string.rfind invocation resulted in
-  File "sphinx/environment .py", line 537, in warn_and_replace
-TypeError: slice indices must be integers or None or have an __index__ method
---- sphinx/sphinx/environment.py.orig	2009-05-14 02:41:20.000000000 +0700
-+++ sphinx/sphinx/environment.py	2009-05-14 02:41:37.000000000 +0700
-@@ -534,7 +534,7 @@
-         """
-         Custom decoding error handler that warns and replaces.
-         """
--        linestart = error.object.rfind('\n', None, error.start)
-+        linestart = error.object.rfind('\n', 0, error.start)
-         lineend = error.object.find('\n', error.start)
-         if lineend == -1: lineend = len(error.object)
-         lineno = error.object.count('\n', 0, error.start) + 1

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2009-06-17 14:23:46 UTC (rev 8794)
+++ packages/sphinx/trunk/debian/patches/series	2009-06-17 17:56:39 UTC (rev 8795)
@@ -1,4 +1,2 @@
-add_missing_sphinx-autogen.patch
 move_static_files_outside_site-packages.patch
 disable_ez_setup.patch
-rfind-invocation.patch