[Python-modules-commits] [pycurl] 01/01: Tentative Ubuntu delta.

[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 7d37674f68fc592fddb6445e644e62c03c082480
Author: Barry Warsaw <barry at python.org>
Date:   Wed Oct 1 19:39:04 2014 -0400

    Tentative Ubuntu delta.
---
 debian/changelog | 10 +++++++---
 debian/control   |  5 ++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c85566f..2e24dfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-pycurl (7.19.5-2) UNRELEASED; urgency=medium
+pycurl (7.19.5-1ubuntu1) UNRELEASED; urgency=medium
 
-  * d/control: Update the Vcs-* headers for the move to git-dpm.
+  * 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 debian.org>  Wed, 01 Oct 2014 18:00:00 -0400
+ -- Barry Warsaw <barry at ubuntu.com>  Wed, 01 Oct 2014 18:05:37 -0400
 
 pycurl (7.19.5-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index ae944f0..31e60f6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,15 @@
 Source: pycurl
 Section: python
 Priority: optional
-Maintainer: Barry Warsaw <barry at debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Barry Warsaw <barry at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
                dh-python,
                libcurl4-gnutls-dev (>= 7.19.0),
                libgnutls28-dev,
-               libssh2-1-dev,
                python-all-dbg,
                python-all-dev (>= 2.6.6-3~),
-               python-bottle,
                python-docutils,
                python-nose,
                python-sphinx,

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