[Python-modules-commits] [billiard] 06/09: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository billiard.

commit ba89b18a8c25731d1af6ac11355975f369ff466a
Merge: 09fb5ec a6de130
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Dec 19 21:38:16 2015 +0100

    merge patched into master

 CHANGES.txt                                   |  5 +++++
 PKG-INFO                                      |  9 +++++++--
 README.rst                                    |  2 +-
 billiard.egg-info/PKG-INFO                    |  9 +++++++--
 billiard/__init__.py                          |  2 +-
 billiard/py3/connection.py                    | 11 +++++------
 billiard/tests/test_common.py                 |  6 ++++++
 debian/.git-dpm                               |  6 +++---
 debian/patches/exclude_funtests_package.patch |  2 +-
 debian/patches/hurd.patch                     |  2 +-
 debian/patches/spelling.patch                 |  2 +-
 requirements/test.txt                         |  1 +
 12 files changed, 39 insertions(+), 18 deletions(-)

diff --cc debian/.git-dpm
index 8f76a60,0000000..956ea68
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- db1805a13b2e47657f2b1a8ec5c30992189082a2
- db1805a13b2e47657f2b1a8ec5c30992189082a2
- 04f4cd56873c7d80995137920fb03b5a9f28d966
++a6de130688f60765ddae12f777aed58ed2ba223c
++a6de130688f60765ddae12f777aed58ed2ba223c
++9551eb2f18a749165613a493723b0d896c5f5f6a
 +9551eb2f18a749165613a493723b0d896c5f5f6a
 +billiard_3.3.0.22.orig.tar.gz
 +104b96baab5a921d7efd6d9c65b187619c9a3bb0
 +151192
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/exclude_funtests_package.patch
index 6531107,0000000..e099c6f
mode 100644,000000..100644
--- a/debian/patches/exclude_funtests_package.patch
+++ b/debian/patches/exclude_funtests_package.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 0c4a9488de28e4bee8692f18d6f61ea22a05dcbb Mon Sep 17 00:00:00 2001
++From 9eec445c6b62b3b5318e7309ae3e281a1d073773 Mon Sep 17 00:00:00 2001
 +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 --cc debian/patches/hurd.patch
index a52a47a,0000000..346671c
mode 100644,000000..100644
--- a/debian/patches/hurd.patch
+++ b/debian/patches/hurd.patch
@@@ -1,31 -1,0 +1,31 @@@
- From db1805a13b2e47657f2b1a8ec5c30992189082a2 Mon Sep 17 00:00:00 2001
++From a6de130688f60765ddae12f777aed58ed2ba223c Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <fladi at debian.org>
 +Date: Thu, 8 Oct 2015 08:33:15 -0700
 +Subject: Add configuration for GNU/Hurd when building.
 +
 +Last-Update: 2015-05-19
 +Forwarded: no
 +
 +Patch-Name: hurd.patch
 +---
 + setup.py | 7 +++++++
 + 1 file changed, 7 insertions(+)
 +
 +diff --git a/setup.py b/setup.py
 +index 710fdcb..1ff65c9 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -138,6 +138,13 @@ elif sys.platform.startswith('openbsd'):
 +         HAVE_FD_TRANSFER=1,
 +     )
 +     libraries = []
 ++elif sys.platform.startswith('gnu'):
 ++    macros = dict(                  # GNU/Hurd
 ++        HAVE_SEM_OPEN=0,            # Not implemented
 ++        HAVE_SEM_TIMEDWAIT=0,
 ++        HAVE_FD_TRANSFER=1,
 ++    )
 ++    libraries = []
 + else:                                   # Linux and other unices
 +     macros = dict(
 +         HAVE_SEM_OPEN=1,
diff --cc debian/patches/spelling.patch
index 079e2b1,0000000..f13f99c
mode 100644,000000..100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 5723b8528e2cac4a50bee6f3f4e2bbbf62c16689 Mon Sep 17 00:00:00 2001
++From 82a677c4d666dde298c90c2dbcb48216c4be0ac0 Mon Sep 17 00:00:00 2001
 +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