[Python-modules-commits] [pycurl] 06/07: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Tue Jan 12 19:46:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository pycurl.
commit ec454c83fb1f47530cc43e9ae1002234f8f9b2ac
Merge: 5acf01e 16e907f
Author: Barry Warsaw <barry at python.org>
Date: Tue Jan 12 14:27:55 2016 -0500
merge patched into master
AUTHORS | 14 +-
COPYING-MIT | 2 +-
ChangeLog | 78 ++++
INSTALL.rst | 44 +-
MANIFEST.in | 1 +
Makefile | 3 +
PKG-INFO | 2 +-
README.rst | 10 +-
RELEASE-NOTES.rst | 26 +-
debian/.git-dpm | 6 +-
debian/patches/10_setup.py.patch | 4 +-
debian/patches/20_build_doc_for_debian.patch | 6 +-
debian/patches/30_find-perm_slash.diff | 18 -
debian/patches/series | 1 -
doc/callbacks.rst | 304 +++++++++----
doc/conf.py | 6 +-
doc/curlobject.rst | 2 +
doc/docstrings/curl_setopt.rst | 4 +-
doc/index.rst | 2 +-
doc/release-process.rst | 38 +-
examples/ssh_keyfunction.py | 15 +
setup.py | 54 ++-
src/docstrings.c | 4 +-
src/easy.c | 382 ++++++++++++++--
src/module.c | 373 +++++++++++----
src/pycurl.h | 13 +-
tests/close_socket_cb_test.py | 75 ++++
...e_function_test.py => default_write_cb_test.py} | 12 +-
tests/error_constants_test.py | 4 +
tests/fake-curl/libcurl/with_gnutls.so | Bin 0 -> 6095 bytes
tests/fake-curl/libcurl/with_nss.so | Bin 0 -> 6092 bytes
tests/fake-curl/libcurl/with_openssl.so | Bin 0 -> 6120 bytes
tests/fake-curl/libcurl/with_unknown_ssl.so | Bin 0 -> 6124 bytes
tests/fake-curl/libcurl/without_ssl.so | Bin 0 -> 6087 bytes
.../{header_function_test.py => header_cb_test.py} | 12 +-
tests/matrix.py | 16 +-
tests/open_socket_cb_test.py | 115 +++++
tests/option_constants_test.py | 185 +++++++-
tests/{read_callback_test.py => read_cb_test.py} | 32 +-
tests/run.sh | 5 +
...constants_test.py => seek_cb_constants_test.py} | 6 +-
tests/{seek_function_test.py => seek_cb_test.py} | 8 +-
tests/setup_test.py | 11 +
tests/socket_open_test.py | 44 --
tests/sockopt_cb_test.py | 84 ++++
tests/ssh_key_cb_test.py | 84 ++++
tests/util.py | 55 ++-
tests/version_constants_test.py | 81 ++++
winbuild.py | 499 ++++++++++++++++++---
winbuild/c-ares-vs2015.patch | 13 +
winbuild/libcurl-fix-zlib-references.patch | 25 ++
winbuild/libssh2-vs2015.patch | 10 +
winbuild/openssl-fix-crt.patch | 29 ++
53 files changed, 2322 insertions(+), 495 deletions(-)
diff --cc debian/.git-dpm
index b86f990,0000000..d1911dc
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
- 581f359bda50217fd57d6b042f28feedc16dae01
- 581f359bda50217fd57d6b042f28feedc16dae01
- 8d86b847e4851561d8c00456401cccbda6047f2c
++16e907fbfc8b8905cadd96ef54f7379fe0718c52
++16e907fbfc8b8905cadd96ef54f7379fe0718c52
++27c9dcbe03ae89b24377b8c629f3ed3c393d6432
+27c9dcbe03ae89b24377b8c629f3ed3c393d6432
+pycurl_7.21.5.orig.tar.gz
+60865d22fc715ca5197117ea3ad32413d3c7402e
+170962
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/10_setup.py.patch
index fc40a91,0000000..f9446d7
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 dcaaf657bc3f86c181948fba7260f2bf7183b23f Mon Sep 17 00:00:00 2001
++From fdd8cd2d8b00f4fd95d58dfc16372aa6309acf35 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 e16e6d6..dfd123f 100644
++index 0f14571..01233eb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -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 f7ce9d6,0000000..6b677e2
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 581f359bda50217fd57d6b042f28feedc16dae01 Mon Sep 17 00:00:00 2001
++From 16e907fbfc8b8905cadd96ef54f7379fe0718c52 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 c7f2370..6a9a588 100644
++index 5d58628..ac4c50f 100644
+--- a/Makefile
++++ b/Makefile
- @@ -140,6 +140,7 @@ docs: build
++@@ -143,6 +143,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 eb7d5ce,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
- 30_find-perm_slash.diff
--
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