[Python-modules-commits] [pycurl] 05/19: 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 60f7418c27a8eae89b365f2d65d5f0a58eb80ac7
Author: Barry Warsaw <barry at python.org>
Date:   Wed Oct 1 20:08:45 2014 -0400

    Merge with master branch.
---
 debian/changelog | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index aee35d1..60f3d2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,7 @@ pycurl (7.19.5-3) unstable; urgency=medium
  -- Barry Warsaw <barry at debian.org>  Tue, 14 Oct 2014 16:56:10 -0400
 
 pycurl (7.19.5-2ubuntu1) utopic; urgency=medium
+<<<<<<< HEAD
 
   * Merge with Debian; remaining changes:
     - Remove build dependency on python-bottle (universe).
@@ -76,6 +77,8 @@ 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 master branch.
 
   * Merge with Debian; remaining changes:
     - Remove build dependency on python-bottle (universe).
@@ -83,7 +86,13 @@ pycurl (7.19.5-1ubuntu1) UNRELEASED; urgency=medium
       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
+ -- 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.
+
+ -- Barry Warsaw <barry at debian.org>  Wed, 01 Oct 2014 19:42:50 -0400
 
 pycurl (7.19.5-1) unstable; urgency=medium
 

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