[Python-modules-commits] [pycurl] 18/19: Merge branch 'ubuntu' of git+ssh://git.debian.org/git/python-modules/packages/pycurl 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 ebb43417cca5e0bf83e779601e613e2fb622e36e
Merge: 1d81fef a7d0f68
Author: Barry Warsaw <barry at python.org>
Date:   Wed Nov 18 14:01:40 2015 -0500

    Merge branch 'ubuntu' of
    git+ssh://git.debian.org/git/python-modules/packages/pycurl into ubuntu

 debian/changelog | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --cc debian/changelog
index f4de7a8,d7f0051..bd848a7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,24 -2,24 +2,40 @@@ pycurl (7.19.5.3-1) unstable; urgency=m
  
    * New upstream release.
  
 - -- Barry Warsaw <barry at debian.org>  Wed, 18 Nov 2015 13:22:00 -0500
 + -- Barry Warsaw <barry at debian.org>  Wed, 18 Nov 2015 13:46:28 -0500
 +
 +pycurl (7.19.5.1-1ubuntu2) wily; urgency=medium
 +
 +  * No-change rebuild for python3.5 transition
 +
 + -- Steve Langasek <steve.langasek at ubuntu.com>  Wed, 22 Jul 2015 21:12:58 +0000
 +
 +pycurl (7.19.5.1-1ubuntu1) wily; 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, 11 May 2015 15:50:26 -0400
  
+ pycurl (7.19.5.1-1ubuntu2) wily; urgency=medium
+ 
+   * No-change rebuild for python3.5 transition
+ 
+  -- Steve Langasek <steve.langasek at ubuntu.com>  Wed, 22 Jul 2015 21:12:58 +0000
+ 
+ pycurl (7.19.5.1-1ubuntu1) wily; 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, 11 May 2015 15:50:26 -0400
+ 
  pycurl (7.19.5.1-1) unstable; urgency=medium
  
    * New upstream release.

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