[Python-modules-commits] [pycurl] 01/03: Merge branch 'master' into ubuntu

[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 7262a2efa9a1b4466a09dfb0101fc066c4f7b5d1
Merge: 408e896 a09102f
Author: Barry Warsaw <barry at python.org>
Date:   Tue Oct 14 17:36:55 2014 -0400

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/changelog

 debian/.git-dpm                              |  4 ++--
 debian/changelog                             |  8 ++++++++
 debian/patches/0003-upstream-issue-210.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 debian/watch                                 |  4 ++--
 src/easy.c                                   |  4 ++++
 6 files changed, 43 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index fefe556,a8c2f3e..403ca59
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,11 +1,21 @@@
+ pycurl (7.19.5-3) unstable; urgency=medium
+ 
+   * d/watch: Updated download URL to point to PyPI.
+   * d/patches/0003-upstream-issue-210.patch: Added a proposed fix for
+     upstream issue #210.
+ 
+  -- Barry Warsaw <barry at debian.org>  Tue, 14 Oct 2014 16:56:10 -0400
+ 
 +pycurl (7.19.5-2ubuntu1) utopic; 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>  Mon, 06 Oct 2014 13:25:09 -0400
 +
  pycurl (7.19.5-2) unstable; urgency=medium
  
    * d/control: Update the Vcs-* headers for the move to git-dpm.

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