[Python-modules-commits] [billiard] 06/13: merge patched into master
Brian May
bam at moszumanska.debian.org
Sun Apr 17 08:46:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository billiard.
commit 73674c37587c5e6198e00723c8d343d70abca5b8
Merge: 5c1f893 14fc8c9
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Thu Mar 31 11:01:02 2016 +0200
merge patched into master
CHANGES.txt | 10 +++
Modules/_billiard/connection.h | 75 ++++++++++++++--------
PKG-INFO | 14 +++-
README.rst | 2 +-
billiard.egg-info/PKG-INFO | 14 +++-
billiard.egg-info/top_level.txt | 4 +-
billiard/__init__.py | 2 +-
billiard/einfo.py | 36 +++++++++--
billiard/five.py | 8 ++-
billiard/forking.py | 2 +-
debian/.git-dpm | 6 +-
...4-Fix-spelling-error-in-multiprocessing.c.patch | 2 +-
debian/patches/exclude_funtests_package.patch | 2 +-
debian/patches/hurd.patch | 2 +-
debian/patches/spelling.patch | 2 +-
15 files changed, 131 insertions(+), 50 deletions(-)
diff --cc debian/.git-dpm
index 22730c5,0000000..2a534cb
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
- be0df8b7d94ef5d66f334f0e59587dd4a8ca49df
- be0df8b7d94ef5d66f334f0e59587dd4a8ca49df
- 9551eb2f18a749165613a493723b0d896c5f5f6a
++14fc8c9682e51c888b6ad3e0390157fb4884245e
++14fc8c9682e51c888b6ad3e0390157fb4884245e
++c1f1e19192429a42452c33d84a178d104bc58a5c
+c1f1e19192429a42452c33d84a178d104bc58a5c
+billiard_3.3.0.23.orig.tar.gz
+da141bbc46d65ec93eec13886e839781cd00c9f2
+151675
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-Fix-spelling-error-in-multiprocessing.c.patch
index 044e6d7,0000000..5e8b972
mode 100644,000000..100644
--- a/debian/patches/0004-Fix-spelling-error-in-multiprocessing.c.patch
+++ b/debian/patches/0004-Fix-spelling-error-in-multiprocessing.c.patch
@@@ -1,22 -1,0 +1,22 @@@
- From be0df8b7d94ef5d66f334f0e59587dd4a8ca49df Mon Sep 17 00:00:00 2001
++From 14fc8c9682e51c888b6ad3e0390157fb4884245e Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Sat, 19 Dec 2015 21:54:38 +0100
+Subject: Fix spelling error in multiprocessing.c.
+
+---
+ 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 5eb5ad2..1d8e1af 100644
+--- a/Modules/_billiard/multiprocessing.c
++++ b/Modules/_billiard/multiprocessing.c
+@@ -262,7 +262,7 @@ bail:
+ static PyMethodDef Billiard_module_methods[] = {
+ {"address_of_buffer", Billiard_multiprocessing_address_of_buffer, METH_O,
+ "address_of_buffer(obj) -> int\n\n"
+- "Return address of obj assuming obj supports buffer inteface"},
++ "Return address of obj assuming obj supports buffer interface"},
+ #if HAVE_FD_TRANSFER
+ {"sendfd", Billiard_multiprocessing_sendfd, METH_VARARGS,
+ "sendfd(sockfd, fd) -> None\n\n"
diff --cc debian/patches/exclude_funtests_package.patch
index e099c6f,0000000..7a4268e
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 9eec445c6b62b3b5318e7309ae3e281a1d073773 Mon Sep 17 00:00:00 2001
++From aeb20321a68a0b1291419babae2a747c0928239b 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 346671c,0000000..d727f6d
mode 100644,000000..100644
--- a/debian/patches/hurd.patch
+++ b/debian/patches/hurd.patch
@@@ -1,31 -1,0 +1,31 @@@
- From a6de130688f60765ddae12f777aed58ed2ba223c Mon Sep 17 00:00:00 2001
++From b8e18b2375c08eb88a1a2b4c295d064dc8ffaab1 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 f13f99c,0000000..d8d3210
mode 100644,000000..100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 82a677c4d666dde298c90c2dbcb48216c4be0ac0 Mon Sep 17 00:00:00 2001
++From 17e2a2ba534f5b59918088b4313c745ef6663c18 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