[Python-modules-commits] [pycurl] 05/06: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Thu Mar 10 15:09:57 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 3697b7873c459f909ce62ee1c6e85af89e4cce86
Merge: 9a5c11d bd7908f
Author: Barry Warsaw <barry at python.org>
Date: Thu Mar 10 09:48:00 2016 -0500
merge patched into master
AUTHORS | 1 +
COPYING-LGPL | 6 +-
ChangeLog | 77 ++
INSTALL.rst | 113 +-
Makefile | 1 +
PKG-INFO | 91 +-
README.rst | 98 +-
RELEASE-NOTES.rst | 18 +
debian/.git-dpm | 6 +-
debian/patches/10_setup.py.patch | 4 +-
debian/patches/20_build_doc_for_debian.patch | 11 +-
doc/callbacks.rst | 36 +-
doc/conf.py | 4 +-
doc/curlobject.rst | 2 +
doc/docstrings/curl_setopt.rst | 5 +-
doc/docstrings/curl_setopt_string.rst | 31 +
doc/docstrings/curl_unsetopt.rst | 2 +-
doc/index.rst | 127 ++-
doc/quickstart.rst | 50 +-
doc/release-process.rst | 11 +-
doc/unicode.rst | 10 +-
doc/unimplemented.rst | 65 ++
examples/quickstart/get.py | 2 +-
examples/quickstart/get_python2.py | 2 +-
examples/quickstart/get_python3.py | 2 +-
examples/quickstart/response_headers.py | 12 +-
examples/quickstart/response_info.py | 2 +-
examples/tests/test_build_config.py | 4 +-
python/curl/__init__.py | 3 +-
requirements-dev-3.1.txt | 1 +
requirements-dev.txt | 1 +
setup.py | 92 +-
src/docstrings.c | 39 +-
src/docstrings.h | 1 +
src/easy.c | 1575 +++++++++++++++-----------
src/module.c | 126 ++-
src/multi.c | 199 +++-
src/pycurl.h | 37 +-
src/threadsupport.c | 34 +-
tests/app.py | 12 +-
tests/getinfo_test.py | 11 +-
tests/memory_mgmt_test.py | 66 +-
tests/multi_option_constants_test.py | 59 +-
tests/open_socket_cb_test.py | 3 +-
tests/option_constants_test.py | 105 ++
tests/post_test.py | 32 +-
tests/run.sh | 4 +-
tests/setopt_string_test.py | 30 +
tests/setopt_test.py | 80 +-
tests/util.py | 9 +-
tests/xferinfo_cb_test.py | 74 ++
winbuild.py | 100 +-
52 files changed, 2470 insertions(+), 1016 deletions(-)
diff --cc debian/.git-dpm
index d5d9798,0000000..51d3837
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
- 16e907fbfc8b8905cadd96ef54f7379fe0718c52
- 16e907fbfc8b8905cadd96ef54f7379fe0718c52
- 27c9dcbe03ae89b24377b8c629f3ed3c393d6432
++bd7908f6018f67aa3a8d974ce0e6ebca900ec2c1
++bd7908f6018f67aa3a8d974ce0e6ebca900ec2c1
++81834bfdd6e021247c5ca0c6ec4abe55cc246ca5
+81834bfdd6e021247c5ca0c6ec4abe55cc246ca5
+pycurl_7.43.0.orig.tar.gz
+e8e9c7e9ae91ae32096b8c86cfc7d49976a66d1b
+182522
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/10_setup.py.patch
index f9446d7,0000000..f50dc47
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 fdd8cd2d8b00f4fd95d58dfc16372aa6309acf35 Mon Sep 17 00:00:00 2001
++From fbccae0358619dda2ae5c493a107db58af9c344b 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 0f14571..01233eb 100644
++index a743ef9..0216ac5 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 6b677e2,0000000..daf0ec5
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,26 @@@
- From 16e907fbfc8b8905cadd96ef54f7379fe0718c52 Mon Sep 17 00:00:00 2001
++From bd7908f6018f67aa3a8d974ce0e6ebca900ec2c1 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(+)
++ Makefile | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
- index 5d58628..ac4c50f 100644
++index bcb13e8..dfe62cf 100644
+--- a/Makefile
++++ b/Makefile
- @@ -143,6 +143,7 @@ docs: build
++@@ -143,7 +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
++- cp ChangeLog build/doc
++ rst2html README.rst build/doc/README.html
+
+ # Rebuild all documentation.
+ # As sphinx extracts documentation from pycurl modules, docs targets
--
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