[Python-modules-commits] [billiard] 06/07: merge patched into master
Brian May
bam at moszumanska.debian.org
Wed Nov 18 22:06:23 UTC 2015
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository billiard.
commit f702096bd48bed52d315f03e472b44ab2eb89183
Merge: 33cfa36 db1805a
Author: Brian May <bam at debian.org>
Date: Thu Nov 19 08:27:25 2015 +1100
merge patched into master
CHANGES.txt | 7 +++++
PKG-INFO | 13 +++++++--
README.rst | 2 +-
billiard.egg-info/PKG-INFO | 13 +++++++--
billiard/__init__.py | 40 ++++++++++++---------------
billiard/dummy/__init__.py | 12 ++++----
billiard/dummy/connection.py | 3 +-
billiard/five.py | 2 +-
billiard/managers.py | 4 +--
billiard/pool.py | 24 +++++++++-------
billiard/process.py | 4 +--
billiard/py2/connection.py | 3 +-
billiard/py2/reduction.py | 4 +--
billiard/py3/connection.py | 9 +++---
billiard/queues.py | 4 +--
billiard/synchronize.py | 8 +++---
debian/.git-dpm | 6 ++--
debian/patches/exclude_funtests_package.patch | 6 ++--
debian/patches/hurd.patch | 6 ++--
debian/patches/spelling.patch | 2 +-
funtests/tests/test_multiprocessing.py | 2 +-
setup.cfg | 3 ++
setup.py | 7 +++--
23 files changed, 105 insertions(+), 79 deletions(-)
diff --cc debian/.git-dpm
index 5dc5743,0000000..632605d
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
- b725ae6e4dd1908f38a56acf990b8d41b7d748ed
- b725ae6e4dd1908f38a56acf990b8d41b7d748ed
- 6faa88ce76dfce0c449a2c07ca7d2884075f1936
++db1805a13b2e47657f2b1a8ec5c30992189082a2
++db1805a13b2e47657f2b1a8ec5c30992189082a2
++04f4cd56873c7d80995137920fb03b5a9f28d966
+04f4cd56873c7d80995137920fb03b5a9f28d966
+billiard_3.3.0.21.orig.tar.gz
+13355cf50b21decc6a06dda19a2bc54d377c37b2
+151141
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/exclude_funtests_package.patch
index 4a94c34,0000000..6531107
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 8f3bd3ebd0b8921bb51210129c633ff6523f37b4 Mon Sep 17 00:00:00 2001
++From 0c4a9488de28e4bee8692f18d6f61ea22a05dcbb 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 6c4e658..348bf5a 100644
++index 138975e..710fdcb 100644
+--- a/setup.py
++++ b/setup.py
- @@ -214,7 +214,7 @@ def run_setup(with_extensions=True):
++@@ -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 c6b5ddf,0000000..a52a47a
mode 100644,000000..100644
--- a/debian/patches/hurd.patch
+++ b/debian/patches/hurd.patch
@@@ -1,31 -1,0 +1,31 @@@
- From b725ae6e4dd1908f38a56acf990b8d41b7d748ed Mon Sep 17 00:00:00 2001
++From db1805a13b2e47657f2b1a8ec5c30992189082a2 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 348bf5a..1b090cc 100644
++index 710fdcb..1ff65c9 100644
+--- a/setup.py
++++ b/setup.py
- @@ -135,6 +135,13 @@ elif sys.platform.startswith('openbsd'):
++@@ -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 d63228e,0000000..079e2b1
mode 100644,000000..100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 6f5f878d6f5c7b80d625dc839e453bbe5e97a5fe Mon Sep 17 00:00:00 2001
++From 5723b8528e2cac4a50bee6f3f4e2bbbf62c16689 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
More information about the Python-modules-commits
mailing list