[Python-modules-commits] [sphinx] 03/03: Update patches for the new release.

[Dmitry Shachnev]

This is an automated email from the git hooks/post-receive script.

mitya57 pushed a commit to branch debian/master
in repository sphinx.

commit fd24631526d4913c825229dd00aa2fb829b71d14
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Sep 26 10:28:10 2017 +0300

    Update patches for the new release.
---
 debian/changelog                                    |  1 +
 debian/patches/no_snowballstemmer.diff              | 10 +++++-----
 debian/patches/series                               |  1 -
 .../upstream_fix_crash_on_parallel_build.diff       | 21 ---------------------
 4 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13dcfe3..6a7f8d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ sphinx (1.6.4-1) UNRELEASED; urgency=medium
 
   * New upstream release.
     - Fixes incorrect return status in sphinx-build (closes: #876048).
+  * Drop upstream_fix_crash_on_parallel_build.diff, applied upstream.
   * dh_sphinxdoc: Turn warning about missing SOURCELINK_SUFFIX to an error.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sat, 23 Sep 2017 17:17:32 +0300
diff --git a/debian/patches/no_snowballstemmer.diff b/debian/patches/no_snowballstemmer.diff
index 70588fa..cb2fd10 100644
--- a/debian/patches/no_snowballstemmer.diff
+++ b/debian/patches/no_snowballstemmer.diff
@@ -12,7 +12,7 @@ Forwarded: not-needed
  5 files changed, 2 insertions(+), 17 deletions(-)
 
 diff --git a/Sphinx.egg-info/requires.txt b/Sphinx.egg-info/requires.txt
-index b108784..972ee1d 100644
+index 6159289..faac9c2 100644
 --- a/Sphinx.egg-info/requires.txt
 +++ b/Sphinx.egg-info/requires.txt
 @@ -2,7 +2,6 @@ six>=1.5
@@ -20,11 +20,11 @@ index b108784..972ee1d 100644
  Pygments>=2.0
  docutils>=0.11
 -snowballstemmer>=1.1
- babel>=1.3,!=2.0
- alabaster>=0.7,<0.8
+ babel!=2.0,>=1.3
+ alabaster<0.8,>=0.7
  imagesize
 diff --git a/setup.py b/setup.py
-index 177ae8d..e8556c2 100644
+index e5453f6..0b3b128 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -46,7 +46,6 @@ requires = [
@@ -76,7 +76,7 @@ index a8439ba..f602464 100755
          __import__(modname)
      except ImportError as err:
 diff --git a/tests/test_search.py b/tests/test_search.py
-index 19b322d..f4b0135 100644
+index 21c0bad..a085a50 100644
 --- a/tests/test_search.py
 +++ b/tests/test_search.py
 @@ -85,6 +85,7 @@ def test_meta_keys_are_handled_for_language_en(app, status, warning):
diff --git a/debian/patches/series b/debian/patches/series
index 762b03b..609a68b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ disable_js_version_check.diff
 no_snowballstemmer.diff
 skip_tests_network.diff
 no_require_websupport.diff
-upstream_fix_crash_on_parallel_build.diff
diff --git a/debian/patches/upstream_fix_crash_on_parallel_build.diff b/debian/patches/upstream_fix_crash_on_parallel_build.diff
deleted file mode 100644
index 915f462..0000000
--- a/debian/patches/upstream_fix_crash_on_parallel_build.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Takeshi KOMIYA <i.tkomiya at gmail.com>
-Date: Tue, 5 Sep 2017 01:37:33 +0900
-Subject: Fix #4006: Fix crash on parallel build
-
-(cherry picked from commit 0cb57f19a099be2809a8fb5dc9274f7411e1caac)
----
- sphinx/util/parallel.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sphinx/util/parallel.py b/sphinx/util/parallel.py
-index 7ca4e94..9bc3c36 100644
---- a/sphinx/util/parallel.py
-+++ b/sphinx/util/parallel.py
-@@ -122,6 +122,7 @@ class ParallelTasks(object):
-                     logger.handle(log)
-                 self._result_funcs.pop(tid)(self._args.pop(tid), result)
-                 self._procs[tid].join()
-+                self._precvs.pop(tid)
-                 self._pworking -= 1
-                 break
-         else:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sphinx.git