[Python-modules-commits] [pycurl] 16/19: Fix changelog.

[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 1fb20f44cbdc6b2772ffcd7ee338408be4789503
Author: Barry Warsaw <barry at python.org>
Date:   Wed Nov 18 14:00:59 2015 -0500

    Fix changelog.
---
 debian/changelog | 94 --------------------------------------------------------
 1 file changed, 94 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ad3767..535e3c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,37 +1,3 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-pycurl (7.19.5.3-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- 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
-=======
-pycurl (7.19.5-3ubuntu1) utopic; urgency=medium
->>>>>>> Release.
-=======
-pycurl (7.19.5.1-1ubuntu1) wily; urgency=medium
->>>>>>> release
-
-  * 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.
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> release
- -- 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
@@ -64,29 +30,7 @@ pycurl (7.19.5-3ubuntu1) utopic; urgency=medium
       not needed since in Ubuntu, curl-config --static-libs doesn't return
       -lssh2.
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< 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:
-=======
- -- Barry Warsaw <barry at ubuntu.com>  Tue, 14 Oct 2014 17:46:13 -0400
->>>>>>> Release.
-=======
- -- Barry Warsaw <barry at ubuntu.com>  Tue, 14 Oct 2014 17:46:13 -0400
->>>>>>> Release
-=======
- -- Barry Warsaw <barry at ubuntu.com>  Tue, 14 Oct 2014 17:38:17 -0400
->>>>>>> Merge with Debian; remaining changes:
-=======
  -- Barry Warsaw <barry at ubuntu.com>  Tue, 14 Oct 2014 17:46:13 -0400
->>>>>>> Release.
 
 pycurl (7.19.5-3) unstable; urgency=medium
 
@@ -97,44 +41,6 @@ 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
-<<<<<<< HEAD
-
-  * 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, 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-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-1ubuntu1) UNRELEASED; urgency=medium
-=======
->>>>>>> Merge with master branch.
-
-  * 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, 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).

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