[Python-modules-commits] [pycurl] 01/02: Merge unstable into ubuntu.

[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 2e0bfcd61f7a1cf2d6b0858f359afc17d1783b65
Merge: 6f0b9d3 04917d8
Author: Barry Warsaw <barry at python.org>
Date:   Thu Dec 15 13:52:51 2016 -0500

    Merge unstable into ubuntu.
    
    I think I'm going to syncpackage it though.

 README.rst                                         |  3 ---
 debian/.git-dpm                                    |  4 ++--
 debian/changelog                                   | 23 ++++++++++++++++++++++
 debian/compat                                      |  2 +-
 debian/control                                     |  8 ++++----
 .../0004-Removed-privacy-breach-in-docs.patch      | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  9 +++++++++
 8 files changed, 63 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index 2275aa6,954d5f9..bcf1281
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,16 +1,36 @@@
++pycurl (7.43.0-2ubuntu1) 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>  Thu, 15 Dec 2016 13:43:34 -0500
++
+ pycurl (7.43.0-2) unstable; urgency=medium
+ 
+   [ Ondřej Nový ]
+   * Fixed VCS URL (https)
+   * Bump debhelper compat version to 9
+   * Standards-Version is 3.9.8 now (no changes needed)
+   * Removed privacy breach in docs
+ 
+   [ Barry Warsaw ]
+   * d/rules: Prevent network access during package tests. (Closes: #830281)
+ 
+  -- Barry Warsaw <barry at debian.org>  Thu, 15 Dec 2016 10:55:57 -0500
+ 
 +pycurl (7.43.0-1ubuntu1) xenial; 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>  Thu, 10 Mar 2016 11:54:05 -0500
 +
  pycurl (7.43.0-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 2631666,669b43f..358e0af
--- a/debian/control
+++ b/debian/control
@@@ -1,10 -1,9 +1,10 @@@
  Source: pycurl
  Section: python
  Priority: optional
 -Maintainer: Barry Warsaw <barry at debian.org>
 -Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.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~),
+ Build-Depends: debhelper (>= 9),
                 dh-python,
                 libcurl4-gnutls-dev (>= 7.19.0),
                 libgnutls28-dev,

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