[Python-modules-commits] [pycurl] 05/08: Merge with master branch.

[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 bb400f73fbd395da8d7c646bd643c5791fad2bb8
Author: Barry Warsaw <barry at python.org>
Date:   Wed Oct 1 20:08:45 2014 -0400

    Merge with master branch.
---
 debian/changelog | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cd1871a..d7f0051 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,16 +62,6 @@ pycurl (7.19.5-2) unstable; urgency=medium
 
  -- Barry Warsaw <barry at debian.org>  Wed, 01 Oct 2014 19:42:50 -0400
 
-pycurl (7.19.5-1ubuntu1) UNRELEASED; 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>  Wed, 01 Oct 2014 18:05:37 -0400
-
 pycurl (7.19.5-1) unstable; urgency=medium
 
   * Team upload.

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