From 93fe8e374d773f4bd6bc6239920b1dc79c543ec9 Mon Sep 17 00:00:00 2001
From: Daniele Tricoli <eriol@mornie.org>
Date: Wed, 8 Oct 2014 19:23:37 +0000
Subject: - Add python-ndg-httpsclient, python-openssl and python-pyasn1 into  
 python-urllib3's Recomends to ensure that SNI works as expected and to  
 prevent CRIME attack. (Closes: #755805) - Add python3-ndg-httpsclient,
 python3-openssl and python3-pyasn1 into   python3-urllib3's Suggests since
 Python 3 already support SNI and   and SSL compression can be disabled using
 OP_NO_COMPRESSION.

---
 debian/changelog |  8 ++++++-
 debian/control   | 66 +++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 46 insertions(+), 28 deletions(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 82f992e..806b156 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ requests (2.4.2-1) UNRELEASED; urgency=medium
   * debian/control
     - Fix duplicate-short-description.
     - Bump Standards-Version to 3.9.6 (no changes needed).
+    - Add python-ndg-httpsclient, python-openssl and python-pyasn1 into
+      python-urllib3's Recomends to ensure that SNI works as expected and to
+      prevent CRIME attack. (Closes: #755805)
+    - Add python3-ndg-httpsclient, python3-openssl and python3-pyasn1 into
+      python3-urllib3's Suggests since Python 3 already support SNI and
+      and SSL compression can be disabled using OP_NO_COMPRESSION.
   * debian/patches/01_use-system-ca-certificates.patch
     - Refresh.
   * debian/patches/02_use-system-chardet-and-urllib3.patch
@@ -14,7 +20,7 @@ requests (2.4.2-1) UNRELEASED; urgency=medium
     - Provide requests.packages.urllib3 as symlink of python{,3}-urllib3
       system package since it is used as import location. (Closes: #753578)
 
- -- Daniele Tricoli <eriol@mornie.org>  Wed, 08 Oct 2014 20:53:08 +0200
+ -- Daniele Tricoli <eriol@mornie.org>  Wed, 08 Oct 2014 21:17:18 +0200
 
 requests (2.3.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 91929df..a30593a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,19 +3,20 @@ Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.
 Uploaders: Daniele Tricoli <eriol@mornie.org>
 Section: python
 Priority: optional
-Build-Depends: debhelper (>= 9),
-               dh-python,
-               python-all (>= 2.6.6-3),
-               python-chardet,
-               python-pytest,
-               python-setuptools,
-               python-urllib3 (>= 1.7.1),
-               python3-all,
-               python3-chardet,
-               python3-pytest,
-               python3-setuptools,
-               python3-urllib3 (>= 1.7.1),
-               python3-wheel
+Build-Depends:
+ debhelper (>= 9),
+ dh-python,
+ python-all (>= 2.6.6-3),
+ python-chardet,
+ python-pytest,
+ python-setuptools,
+ python-urllib3 (>= 1.7.1),
+ python3-all,
+ python3-chardet,
+ python3-pytest,
+ python3-setuptools,
+ python3-urllib3 (>= 1.7.1),
+ python3-wheel
 Standards-Version: 3.9.6
 X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.0
@@ -25,11 +26,16 @@ Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/requests/t
 
 Package: python-requests
 Architecture: all
-Depends: ca-certificates,
-         python-chardet,
-         python-urllib3 (>= 1.7.1),
-         ${misc:Depends},
-         ${python:Depends}
+Depends:
+ ${misc:Depends},
+ ${python:Depends},
+ ca-certificates,
+ python-chardet,
+ python-urllib3 (>= 1.7.1)
+Recommends: 
+  python-ndg-httpsclient,
+  python-openssl,
+  python-pyasn1
 Description: elegant and simple HTTP library for Python2, built for human beings
  Requests allow you to send HTTP/1.1 requests. You can add headers, form data,
  multipart files, and parameters with simple Python dictionaries, and access
@@ -51,11 +57,16 @@ Description: elegant and simple HTTP library for Python2, built for human beings
 
 Package: python3-requests
 Architecture: all
-Depends: ca-certificates,
-         python3-chardet,
-         python3-urllib3 (>= 1.5),
-         ${misc:Depends},
-         ${python3:Depends}
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
+ ca-certificates,
+ python3-chardet,
+ python3-urllib3 (>= 1.5)
+Suggests:
+ python3-ndg-httpsclient,
+ python3-openssl,
+ python3-pyasn1
 Description: elegant and simple HTTP library for Python3, built for human beings
  Requests allow you to send HTTP/1.1 requests. You can add headers, form data,
  multipart files, and parameters with simple Python dictionaries, and access
@@ -79,10 +90,11 @@ Description: elegant and simple HTTP library for Python3, built for human beings
 
 Package: python-requests-whl
 Architecture: all
-Depends: ca-certificates,
-         python-urllib3-whl,
-         ${misc:Depends},
-         ${python3:Depends}
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
+ ca-certificates,
+ python-urllib3-whl
 Description: elegant and simple HTTP library for Python, built for human beings
  Requests allow you to send HTTP/1.1 requests. You can add headers, form data,
  multipart files, and parameters with simple Python dictionaries, and access
-- 
cgit v1.2.3