[Python-modules-commits] [billiard] 08/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 621f0ef2265a13af608899858f0f354c2f737ba6
Merge: ba89b18 be0df8b
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Dec 19 21:54:56 2015 +0100

    merge patched into master

 Modules/_billiard/multiprocessing.c                |  2 +-
 debian/.git-dpm                                    |  4 ++--
 ...4-Fix-spelling-error-in-multiprocessing.c.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 956ea68,0000000..4204908
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
- a6de130688f60765ddae12f777aed58ed2ba223c
- a6de130688f60765ddae12f777aed58ed2ba223c
++be0df8b7d94ef5d66f334f0e59587dd4a8ca49df
++be0df8b7d94ef5d66f334f0e59587dd4a8ca49df
 +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/0004-Fix-spelling-error-in-multiprocessing.c.patch
index 0000000,0000000..044e6d7
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Fix-spelling-error-in-multiprocessing.c.patch
@@@ -1,0 -1,0 +1,22 @@@
++From be0df8b7d94ef5d66f334f0e59587dd4a8ca49df 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/series
index 7ce11b9,0000000..41ec51b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +spelling.patch
 +exclude_funtests_package.patch
 +hurd.patch
++0004-Fix-spelling-error-in-multiprocessing.c.patch

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