[Python-modules-commits] r26051 - in packages/sphinx/trunk/debian/patches (2 files)

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

    Date: Saturday, October 5, 2013 @ 12:50:50
  Author: mitya57-guest
Revision: 26051

Drop skiptest.diff, refresh disable_distribute_setup.diff

Modified:
  packages/sphinx/trunk/debian/patches/disable_distribute_setup.diff
Deleted:
  packages/sphinx/trunk/debian/patches/skiptest.diff

Modified: packages/sphinx/trunk/debian/patches/disable_distribute_setup.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/disable_distribute_setup.diff	2013-10-05 12:40:23 UTC (rev 26050)
+++ packages/sphinx/trunk/debian/patches/disable_distribute_setup.diff	2013-10-05 12:50:50 UTC (rev 26051)
@@ -1,7 +1,7 @@
 Description: disable use of distribute_setup, which bootstraps distribute installation
 Author: Jakub Wilk <jwilk at debian.org>
 Forwarded: not-needed
-Last-Update: 2011-10-12
+Last-Update: 2013-10-05
 
 --- a/setup.py
 +++ b/setup.py
@@ -10,6 +10,6 @@
      from setuptools import setup, find_packages
  except ImportError:
 +    raise
-     import distribute_setup
-     distribute_setup.use_setuptools()
+     import ez_setup
+     ez_setup.use_setuptools()
      from setuptools import setup, find_packages

Deleted: packages/sphinx/trunk/debian/patches/skiptest.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/skiptest.diff	2013-10-05 12:40:23 UTC (rev 26050)
+++ packages/sphinx/trunk/debian/patches/skiptest.diff	2013-10-05 12:50:50 UTC (rev 26051)
@@ -1,36 +0,0 @@
-Description: raise SkipTest if some optional software is not found
-Author: Jakub Wilk <jwilk at debian.org>
-Bug: https://bitbucket.org/birkenfeld/sphinx/issue/1184
-Forwarded: yes
-Last-Update: 2013-09-18
-
---- a/tests/test_build_latex.py
-+++ b/tests/test_build_latex.py
-@@ -86,7 +86,7 @@
-             p = Popen(['pdflatex', '--interaction=nonstopmode',
-                        'SphinxTests.tex'], stdout=PIPE, stderr=PIPE)
-         except OSError:
--            pass  # most likely pdflatex was not found
-+            raise SkipTest  # most likely pdflatex was not found
-         else:
-             stdout, stderr = p.communicate()
-             if p.returncode != 0:
---- a/tests/test_build_texinfo.py
-+++ b/tests/test_build_texinfo.py
-@@ -18,6 +18,7 @@
- from sphinx.writers.texinfo import TexinfoTranslator
- 
- from util import with_app, test_root, remove_unicode_literals
-+from util import SkipTest
- from test_build_html import ENV_WARNINGS
- 
- 
-@@ -56,7 +57,7 @@
-             p = Popen(['makeinfo', '--no-split', 'SphinxTests.texi'],
-                       stdout=PIPE, stderr=PIPE)
-         except OSError:
--            pass  # most likely makeinfo was not found
-+            raise SkipTest  # most likely makeinfo was not found
-         else:
-             stdout, stderr = p.communicate()
-             retcode = p.returncode