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

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

diff --git a/debian/changelog b/debian/changelog
index f6a034a..29afa56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,7 @@ pycurl (7.19.5-3) unstable; urgency=medium
 
 pycurl (7.19.5-2ubuntu1) utopic; urgency=medium
 <<<<<<< HEAD
+<<<<<<< HEAD
 
   * Merge with Debian; remaining changes:
     - Remove build dependency on python-bottle (universe).
@@ -120,6 +121,8 @@ pycurl (7.19.5-1ubuntu1) UNRELEASED; urgency=medium
  -- Barry Warsaw <barry at ubuntu.com>  Mon, 06 Oct 2014 13:25:09 -0400
 
 pycurl (7.19.5-2) unstable; urgency=medium
+=======
+>>>>>>> Merge with master branch.
 
   * Merge with Debian; remaining changes:
     - Remove build dependency on python-bottle (universe).
@@ -129,6 +132,12 @@ 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-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
 
   * Team upload.

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