[Python-modules-commits] [pycurl] 01/03: Merge with Debian; resolve conflicts

[Barry Warsaw]

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

barry pushed a commit to branch ubuntu
in repository pycurl.

commit 91b5f7d3d8cfc7bc33d2a3aaa990256da32b834c
Merge: 81512d5 2c24fee
Author: Barry Warsaw <barry at python.org>
Date:   Thu Mar 10 11:53:40 2016 -0500

    Merge with Debian; resolve conflicts

 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                              |   14 +-
 debian/changelog                             |   12 +
 debian/control                               |   28 +-
 debian/patches/10_setup.py.patch             |    4 +-
 debian/patches/20_build_doc_for_debian.patch |   11 +-
 debian/patches/30_debianize_tests.patch      |   22 +
 debian/patches/series                        |    1 +
 debian/tests/control                         |    4 +
 debian/tests/livetest.sh                     |   32 +
 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/setopt_string_test.py                  |   30 +
 tests/setopt_test.py                         |   80 +-
 tests/util.py                                |    9 +-
 tests/xferinfo_cb_test.py                    |   74 ++
 winbuild.py                                  |  100 +-
 57 files changed, 2562 insertions(+), 1027 deletions(-)

diff --cc debian/changelog
index 7b5c1b6,d42e7c2..321ccec
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,15 +1,25 @@@
+ pycurl (7.43.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * d/control:
+     - Add python{,3}-flaky to Build-Depends for test suite.
+     - Test suite runs at build time but still fails, so continue not to fail.
+     - Bump Standards-Version to 3.9.7 with no other changes necessary.
+   * d/tests: Add a live test which downloads a well published resource.
+     (Closes: #763770)
+ 
+  -- Barry Warsaw <barry at debian.org>  Thu, 10 Mar 2016 11:19:37 -0500
+ 
 +pycurl (7.21.5-1ubuntu1) xenial; urgency=medium
 +
 +  * Merge with Debian; remaining changes:
 +    - Remove build dependency on python-bottle (universe).
 +    - Drop libssh2-1-dev from Build-Depends, as it is not in main, and is
 +      not needed since in Ubuntu, curl-config --static-libs doesn't return
 +      -lssh2.
 +
 + -- Barry Warsaw <barry at ubuntu.com>  Tue, 12 Jan 2016 16:18:53 -0500
 +
  pycurl (7.21.5-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 52b5c64,227f40b..2631666
--- a/debian/control
+++ b/debian/control
@@@ -8,9 -7,12 +8,10 @@@ Build-Depends: debhelper (>= 7.0.50~)
                 dh-python,
                 libcurl4-gnutls-dev (>= 7.19.0),
                 libgnutls28-dev,
 -               libssh2-1-dev,
                 python-all-dbg,
                 python-all-dev (>= 2.6.6-3~),
 -               python-bottle,
                 python-docutils,
+                python-flaky,
                 python-nose,
                 python-sphinx,
                 python3-all-dbg,

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