[Python-modules-commits] [pycurl] 06/19: Merge with Debian; remaining changes:

[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 64aad7791399ad9517fda73a295ada8df7d0866a
Author: Barry Warsaw <barry at python.org>
Date:   Tue Oct 14 17:38:58 2014 -0400

    Merge with Debian; remaining changes:
    
    * 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.
---
 debian/changelog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 60f3d2c..a992aed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,9 +41,13 @@ pycurl (7.19.5-3ubuntu1) utopic; urgency=medium
       not needed since in Ubuntu, curl-config --static-libs doesn't return
       -lssh2.
 
+<<<<<<< HEAD
 =======
 >>>>>>> Release.
  -- Barry Warsaw <barry at ubuntu.com>  Tue, 14 Oct 2014 17:46:13 -0400
+=======
+ -- Barry Warsaw <barry at ubuntu.com>  Tue, 14 Oct 2014 17:38:17 -0400
+>>>>>>> Merge with Debian; remaining changes:
 
 pycurl (7.19.5-3) unstable; urgency=medium
 

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