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

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

    Date: Sunday, December 15, 2013 @ 11:04:43
  Author: mitya57-guest
Revision: 26761

* New upstream stable release.
* Drop fix_setup_command_test.diff, applied upstream.
* Refresh sphinxcontrib_namespace.diff.

Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/series
  packages/sphinx/trunk/debian/patches/sphinxcontrib_namespace.diff
Deleted:
  packages/sphinx/trunk/debian/patches/fix_setup_command_test.diff

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2013-12-13 16:54:05 UTC (rev 26760)
+++ packages/sphinx/trunk/debian/changelog	2013-12-15 11:04:43 UTC (rev 26761)
@@ -1,5 +1,8 @@
-sphinx (1.2~b3+dfsg-3) UNRELEASED; urgency=low
+sphinx (1.2+dfsg-1) UNRELEASED; urgency=low
 
+  * New upstream stable release.
+  * Drop fix_setup_command_test.diff, applied upstream.
+  * Refresh sphinxcontrib_namespace.diff.
   * Fix package name in Recommends: python3-imaging → python3-pil.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Fri, 08 Nov 2013 18:14:00 +0400

Deleted: packages/sphinx/trunk/debian/patches/fix_setup_command_test.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_setup_command_test.diff	2013-12-13 16:54:05 UTC (rev 26760)
+++ packages/sphinx/trunk/debian/patches/fix_setup_command_test.diff	2013-12-15 11:04:43 UTC (rev 26761)
@@ -1,31 +0,0 @@
-Description: make sure setup_command test finds Sphinx
-Author: Dmitry Shachnev <mitya57 at gmail.com>
-Forwarded: yes, https://bitbucket.org/birkenfeld/sphinx/pull-request/176
-Last-Update: 2013-10-05
-
---- a/tests/test_setup_command.py
-+++ b/tests/test_setup_command.py
-@@ -14,6 +14,7 @@
- import subprocess
- from functools import wraps
- import tempfile
-+import sphinx
- 
- from util import with_tempdir, test_roots, SkipTest
- from path import path
-@@ -35,11 +36,15 @@
-             root.copytree(pkgrootdir)
-             cwd = os.getcwd()
-             os.chdir(pkgrootdir)
-+            pythonpath = os.path.dirname(os.path.dirname(sphinx.__file__))
-+            if os.getenv('PYTHONPATH'):
-+                pythonpath = os.getenv('PYTHONPATH') + os.pathsep + pythonpath
-             command = [sys.executable, 'setup.py', 'build_sphinx']
-             command.extend(args)
-             try:
-                 proc = subprocess.Popen(
-                     command,
-+                    env=dict(os.environ, PYTHONPATH=pythonpath),
-                     stdout=subprocess.PIPE,
-                     stderr=subprocess.PIPE)
-                 func(pkgrootdir, proc, *args, **kwds)

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2013-12-13 16:54:05 UTC (rev 26760)
+++ packages/sphinx/trunk/debian/patches/series	2013-12-15 11:04:43 UTC (rev 26761)
@@ -5,4 +5,3 @@
 python3_test_build_dir.diff
 parallel_2to3.diff
 no_external_css.diff
-fix_setup_command_test.diff

Modified: packages/sphinx/trunk/debian/patches/sphinxcontrib_namespace.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/sphinxcontrib_namespace.diff	2013-12-13 16:54:05 UTC (rev 26760)
+++ packages/sphinx/trunk/debian/patches/sphinxcontrib_namespace.diff	2013-12-15 11:04:43 UTC (rev 26761)
@@ -8,7 +8,7 @@
 
 --- a/sphinx/__init__.py
 +++ b/sphinx/__init__.py
-@@ -35,6 +35,19 @@
+@@ -39,6 +39,19 @@
      except Exception:
          pass