[Python-modules-commits] [pycurl] 02/04: merge patched into master

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository pycurl.

commit a4c2673d93264979b4ecf9be7556d503f9818096
Merge: 4b6071c 9456098
Author: Barry Warsaw <barry at python.org>
Date:   Tue Oct 14 16:26:16 2014 -0400

    merge patched into master

 debian/.git-dpm                              |  4 ++--
 debian/patches/0003-upstream-issue-210.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 src/easy.c                                   |  4 ++++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index ac22b73,0000000..8518249
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 36f7b931a1363416d3256b98bf59474c37007fc1
- 36f7b931a1363416d3256b98bf59474c37007fc1
++9456098cc34953157aceccb4b235cf8201a900fe
++9456098cc34953157aceccb4b235cf8201a900fe
 +31bfa35a9b88bd353aeb97784ac8de4c49755f08
 +31bfa35a9b88bd353aeb97784ac8de4c49755f08
 +pycurl_7.19.5.orig.tar.gz
 +ec36d55a99db9a49fede3bfa27ee16a4f5dc7bef
 +107580
diff --cc debian/patches/0003-upstream-issue-210.patch
index 0000000,0000000..9acd61a
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-upstream-issue-210.patch
@@@ -1,0 -1,0 +1,25 @@@
++From 9456098cc34953157aceccb4b235cf8201a900fe Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Tue, 14 Oct 2014 16:25:57 -0400
++Subject: upstream issue 210
++
++---
++ src/easy.c | 4 ++++
++ 1 file changed, 4 insertions(+)
++
++diff --git a/src/easy.c b/src/easy.c
++index 6f1ba1d..fe52b18 100644
++--- a/src/easy.c
+++++ b/src/easy.c
++@@ -926,7 +926,11 @@ debug_callback(CURL *curlobj, curl_infotype type,
++     }
++ 
++     /* run callback */
+++#if PY_MAJOR_VERSION >= 3
+++    arglist = Py_BuildValue("(iy#)", (int)type, buffer, (int)total_size);
+++#else
++     arglist = Py_BuildValue("(is#)", (int)type, buffer, (int)total_size);
+++#endif
++     if (arglist == NULL)
++         goto verbose_error;
++     result = PyEval_CallObject(self->debug_cb, arglist);
diff --cc debian/patches/series
index 37390bb,0000000..e44f1af
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +10_setup.py.patch
 +20_build_doc_for_debian.patch
++0003-upstream-issue-210.patch

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