[Python-apps-commits] r10212 - in packages/s3ql/trunk/debian/patches (1 file)

[nikratio-guest at users.alioth.debian.org]

    Date: Wednesday, December 4, 2013 @ 03:19:38
  Author: nikratio-guest
Revision: 10212

Refreshed patch.

Modified:
  packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff

Modified: packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff	2013-12-04 03:14:45 UTC (rev 10211)
+++ packages/s3ql/trunk/debian/patches/sphinx-1.1.1-compat.diff	2013-12-04 03:19:38 UTC (rev 10212)
@@ -15,24 +15,21 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -18,9 +18,15 @@
- except ImportError:
-     raise SystemExit('Setuptools/distribute package not found. Please install from '
-                      'https://pypi.python.org/pypi/distribute')
--import setuptools.command.test as setuptools_test
+@@ -19,6 +19,13 @@
+     raise SystemExit('Setuptools package not found. Please install from '
+                      'https://pypi.python.org/pypi/setuptools')
  from setuptools import Extension
-     
++
 +# Work around https://bitbucket.org/birkenfeld/sphinx/issue/1196/
 +import locale
 +import os
 +os.environ['LC_ALL'] = 'C.UTF-8'
 +os.environ['LANG'] = 'C.UTF-8'
 +locale.setlocale(locale.LC_ALL, '')
-+
+     
  import os
  import subprocess
- import logging.handlers
-@@ -66,6 +72,7 @@
+@@ -65,6 +72,7 @@
          except ImportError:
              raise SystemExit('This command requires Sphinx to be installed.') from None
  
@@ -40,7 +37,7 @@
          fix_docutils()
          
          dest_dir = os.path.join(basedir, 'doc')
-@@ -290,6 +297,35 @@
+@@ -289,6 +297,35 @@
      
      assert docutils.parsers.get_parser_class('rst') is rst.Parser