[Python-modules-commits] [pycurl] 05/06: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Wed Nov 18 18:28:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository pycurl.
commit 6fe81bef5cb1e0210207ede6f0ec7fdec07b9079
Merge: b0251d8 581f359
Author: Barry Warsaw <barry at python.org>
Date: Wed Nov 18 13:23:45 2015 -0500
merge patched into master
AUTHORS | 7 +-
COPYING-MIT | 2 +-
ChangeLog | 101 +++++-
INSTALL.rst | 36 ++
MANIFEST.in | 3 +
Makefile | 18 +-
PKG-INFO | 2 +-
README.rst | 2 +-
RELEASE-NOTES.rst | 26 ++
debian/.git-dpm | 6 +-
debian/patches/0003-upstream-issue-210.patch | 25 --
debian/patches/10_setup.py.patch | 10 +-
debian/patches/20_build_doc_for_debian.patch | 6 +-
debian/patches/series | 1 -
doc/callbacks.rst | 72 +++-
doc/conf.py | 6 +-
doc/curlmultiobject.rst | 6 +
doc/docstrings/curl_setopt.rst | 5 +-
doc/docstrings/multi_assign.rst | 7 +
doc/docstrings/multi_setopt.rst | 38 ++
doc/docstrings/multi_socket_action.rst | 5 +-
doc/docstrings/multi_timeout.rst | 6 +
doc/files.rst | 42 +--
doc/quickstart.rst | 69 ++++
doc/unicode.rst | 9 +-
examples/basicfirst.py | 7 +-
examples/linksys.py | 14 +-
examples/quickstart/file_upload_buffer.py | 18 +
examples/quickstart/file_upload_real.py | 18 +
examples/quickstart/file_upload_real_fancy.py | 22 ++
examples/retriever-multi.py | 1 -
examples/retriever.py | 7 +-
examples/sfquery.py | 2 +-
examples/smtp.py | 6 +
examples/tests/test_gtk.py | 1 -
examples/xmlrpc_curl.py | 12 +-
python/curl/__init__.py | 1 -
requirements-dev-2.4.txt | 1 +
requirements-dev.txt => requirements-dev-3.1.txt | 3 +
requirements-dev.txt | 2 +
setup.py | 233 ++++++++----
src/Makefile | 19 -
src/docstrings.c | 66 +++-
src/docstrings.h | 3 +
src/easy.c | 105 ++++--
src/module.c | 97 +++--
src/multi.c | 10 +-
src/oscompat.c | 10 +-
src/pycurl.h | 31 +-
src/pythoncompat.c | 44 +++
src/threadsupport.c | 4 +-
tests/__init__.py | 2 +
tests/app.py | 14 +-
tests/curl_object_test.py | 4 +-
tests/debug_test.py | 31 +-
tests/ext/test-suite.sh | 2 +
tests/fake-curl/libcurl/Makefile | 15 +
tests/fake-curl/libcurl/with_gnutls.c | 29 ++
tests/fake-curl/libcurl/with_nss.c | 29 ++
tests/fake-curl/libcurl/with_openssl.c | 29 ++
tests/fake-curl/libcurl/with_unknown_ssl.c | 29 ++
tests/fake-curl/libcurl/without_ssl.c | 29 ++
tests/ftp_test.py | 8 +-
tests/getinfo_test.py | 2 +
tests/header_test.py | 7 +-
tests/internals_test.py | 2 +-
tests/matrix.py | 2 +-
tests/matrix/openssl-1.0.1e-fix_pod_syntax-1.patch | 393 +++++++++++++++++++++
tests/memory_mgmt_test.py | 41 ++-
tests/multi_memory_mgmt_test.py | 6 +-
tests/multi_option_constants_test.py | 7 +
tests/multi_socket_select_test.py | 2 +-
tests/multi_test.py | 4 +-
tests/option_constants_test.py | 57 ++-
tests/pause_test.py | 2 +
tests/post_test.py | 80 ++++-
tests/procmgr.py | 6 +-
tests/pycurl_object_test.py | 9 +-
tests/reload_test.py | 1 -
tests/reset_test.py | 30 +-
tests/run-quickstart.sh | 38 ++
tests/run.sh | 24 ++
tests/seek_function_test.py | 6 +-
tests/setopt_lifecycle_test.py | 1 -
tests/setopt_unicode_test.py | 4 -
tests/setup_test.py | 99 +++++-
tests/share_test.py | 8 +-
tests/socket_open_test.py | 4 -
tests/util.py | 39 +-
tests/write_cb_bogus_test.py | 1 -
winbuild.py | 292 +++++++++++----
91 files changed, 2203 insertions(+), 432 deletions(-)
diff --cc debian/.git-dpm
index 9336541,0000000..831e4ae
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
- 7e232eecf5078c81d910a03717b440a5e2af7416
- 7e232eecf5078c81d910a03717b440a5e2af7416
- 4d69da98db3a3dfb2b4e3a7a9edb2b9fd0469013
++581f359bda50217fd57d6b042f28feedc16dae01
++581f359bda50217fd57d6b042f28feedc16dae01
++8d86b847e4851561d8c00456401cccbda6047f2c
+8d86b847e4851561d8c00456401cccbda6047f2c
+pycurl_7.19.5.3.orig.tar.gz
+1e5fcda2a5edb59e0cd47125a560c84ab1594cb6
+154800
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/10_setup.py.patch
index 93b9521,0000000..fc40a91
mode 100644,000000..100644
--- a/debian/patches/10_setup.py.patch
+++ b/debian/patches/10_setup.py.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 7a42ba2efaaf5953e91d9dac5c0c6dde7fffdfda Mon Sep 17 00:00:00 2001
++From dcaaf657bc3f86c181948fba7260f2bf7183b23f Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Tue, 30 Sep 2014 17:38:05 -0400
+Subject: Adjust setup.py file for Debian architecture
+
+Patch-Name: 10_setup.py.patch
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
- index 9cb0667..90f5b04 100644
++index e16e6d6..dfd123f 100644
+--- a/setup.py
++++ b/setup.py
- @@ -54,7 +54,7 @@ def scan_argv(s, default=None):
- class ExtensionConfiguration(object):
- def __init__(self):
++@@ -60,7 +60,7 @@ class ExtensionConfiguration(object):
++ self.argv = argv
++ self.original_argv = argv[:]
+ self.include_dirs = []
+- self.define_macros = [("PYCURL_VERSION", '"%s"' % VERSION)]
++ self.define_macros = [("PYCURL_VERSION", '"%s"' % VERSION), ('HAVE_CURL_GNUTLS', 1) ]
+ self.library_dirs = []
+ self.libraries = []
+ self.runtime_library_dirs = []
diff --cc debian/patches/20_build_doc_for_debian.patch
index c0c0a7c,0000000..f7ce9d6
mode 100644,000000..100644
--- a/debian/patches/20_build_doc_for_debian.patch
+++ b/debian/patches/20_build_doc_for_debian.patch
@@@ -1,25 -1,0 +1,25 @@@
- From a4111adc2a24bfd0f2c7ebc0a4b6f0c67a6e3434 Mon Sep 17 00:00:00 2001
++From 581f359bda50217fd57d6b042f28feedc16dae01 Mon Sep 17 00:00:00 2001
+From: Sandro Tosi <morph at debian.org>
+Date: Tue, 30 Sep 2014 17:38:05 -0400
+Subject: Adapt documentation build process for Debian packaging purposes
+
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2014-02-15
+Patch-Name: 20_build_doc_for_debian.patch
+---
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile b/Makefile
- index 99120e7..5a2ba47 100644
++index c7f2370..6a9a588 100644
+--- a/Makefile
++++ b/Makefile
- @@ -142,6 +142,7 @@ docs: build
++@@ -140,6 +140,7 @@ docs: build
+ PYTHONSUFFIX=$$(python -V 2>&1 |awk '{print $$2}' |awk -F. '{print $$1 "." $$2}') && \
+ PYTHONPATH=$$(ls -d build/lib.*$$PYTHONSUFFIX):$$PYTHONPATH \
+ sphinx-build doc build/doc
++ rst2html README.rst build/doc/README.html
+
+ # Rebuild all documentation.
+ # As sphinx extracts documentation from pycurl modules, docs targets
diff --cc debian/patches/series
index e44f1af,0000000..37390bb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
+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
More information about the Python-modules-commits
mailing list