[Python-modules-commits] [billiard] 06/06: Update patches for new upstream

[Brian May]

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

bam pushed a commit to branch debian/master
in repository billiard.

commit 3cc44c1e6ac969b627270757573c20dab81f747c
Author: Brian May <bam at debian.org>
Date:   Thu Jul 13 08:04:22 2017 +1000

    Update patches for new upstream
---
 ...4-Fix-spelling-error-in-multiprocessing.c.patch |  4 ++--
 debian/patches/exclude_funtests_package.patch      | 25 ----------------------
 debian/patches/hurd.patch                          |  4 ++--
 debian/patches/series                              |  2 --
 debian/patches/spelling.patch                      | 25 ----------------------
 5 files changed, 4 insertions(+), 56 deletions(-)

diff --git a/debian/patches/0004-Fix-spelling-error-in-multiprocessing.c.patch b/debian/patches/0004-Fix-spelling-error-in-multiprocessing.c.patch
index 7aaadd1..f329e80 100644
--- a/debian/patches/0004-Fix-spelling-error-in-multiprocessing.c.patch
+++ b/debian/patches/0004-Fix-spelling-error-in-multiprocessing.c.patch
@@ -7,10 +7,10 @@ Subject: Fix spelling error in multiprocessing.c.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Modules/_billiard/multiprocessing.c b/Modules/_billiard/multiprocessing.c
-index 5eb5ad2..1d8e1af 100644
+index 7b58740..de4f1f4 100644
 --- a/Modules/_billiard/multiprocessing.c
 +++ b/Modules/_billiard/multiprocessing.c
-@@ -262,7 +262,7 @@ bail:
+@@ -323,7 +323,7 @@ bail:
  static PyMethodDef Billiard_module_methods[] = {
      {"address_of_buffer", Billiard_multiprocessing_address_of_buffer, METH_O,
       "address_of_buffer(obj) -> int\n\n"
diff --git a/debian/patches/exclude_funtests_package.patch b/debian/patches/exclude_funtests_package.patch
deleted file mode 100644
index 6372133..0000000
--- a/debian/patches/exclude_funtests_package.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Michael Fladischer <fladi at debian.org>
-Date: Thu, 8 Oct 2015 08:33:14 -0700
-Subject: Do not install install funtests package
-
-Last-Update: 2013-07-01
-Forwarded: no
-
-Patch-Name: exclude_funtests_package.patch
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 138975e..710fdcb 100644
---- a/setup.py
-+++ b/setup.py
-@@ -217,7 +217,7 @@ def run_setup(with_extensions=True):
-         ]
-     exclude = 'billiard.py2' if is_py3k else 'billiard.py3'
-     packages = find_packages(exclude=[
--        'ez_setup', 'tests', 'funtests.*', 'tests.*', exclude,
-+        'ez_setup', 'tests', 'funtests', 'funtests.*', 'tests.*', exclude,
-     ])
-     setup(
-         name='billiard',
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
index 8c970b3..62b317b 100644
--- a/debian/patches/hurd.patch
+++ b/debian/patches/hurd.patch
@@ -11,10 +11,10 @@ Patch-Name: hurd.patch
  1 file changed, 7 insertions(+)
 
 diff --git a/setup.py b/setup.py
-index 710fdcb..1ff65c9 100644
+index a80bb6b..e3a8147 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -138,6 +138,13 @@ elif sys.platform.startswith('openbsd'):
+@@ -134,6 +134,13 @@ elif sys.platform.startswith('openbsd'):
          HAVE_FD_TRANSFER=1,
      )
      libraries = []
diff --git a/debian/patches/series b/debian/patches/series
index 41ec51b..73bcb99 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-spelling.patch
-exclude_funtests_package.patch
 hurd.patch
 0004-Fix-spelling-error-in-multiprocessing.c.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index 88f85d3..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Michael Fladischer <fladi at debian.org>
-Date: Thu, 8 Oct 2015 08:33:13 -0700
-Subject: Fix spelling error in upstream
-
-Last-Update: 2013-07-01
-Forwarded: no
-
-Patch-Name: spelling.patch
----
- Modules/_billiard/multiprocessing.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Modules/_billiard/multiprocessing.c b/Modules/_billiard/multiprocessing.c
-index 93e88a5..5eb5ad2 100644
---- a/Modules/_billiard/multiprocessing.c
-+++ b/Modules/_billiard/multiprocessing.c
-@@ -68,7 +68,7 @@ Billiard_SetError(PyObject *Type, int num)
-         break;
-     default:
-         PyErr_Format(PyExc_RuntimeError,
--                     "unkown error number %d", num);
-+                     "unknown error number %d", num);
-     }
-     return NULL;
- }

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