aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/02_use-system-chardet-and-urllib3.patch10
2 files changed, 13 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 9cad6ee..1476497 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+requests (2.3.0-2) UNRELEASED; urgency=medium
+
+ * debian/patches/02_use-system-chardet-and-urllib3.patch
+ - Provide requests.packages package because it will be used to supply
+ a stub for requests.packages.urllib3
+
+ -- Daniele Tricoli <eriol@mornie.org> Thu, 03 Jul 2014 19:09:56 +0200
+
requests (2.3.0-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/02_use-system-chardet-and-urllib3.patch b/debian/patches/02_use-system-chardet-and-urllib3.patch
index 54df371..6853e01 100644
--- a/debian/patches/02_use-system-chardet-and-urllib3.patch
+++ b/debian/patches/02_use-system-chardet-and-urllib3.patch
@@ -1,8 +1,9 @@
Description: Use the system python-chardet and python-urllib3 instead of the
- embedded copies.
+ embedded copies but provide requests.packages package because it will be
+ used to supply a stub for ``requests.packages.urllib3``.
Author: Daniele Tricoli <eriol@mornie.org>
Forwarded: not-needed
-Last-Update: 2014-01-27
+Last-Update: 2014-07-03
--- a/requests/adapters.py
+++ b/requests/adapters.py
@@ -72,11 +73,10 @@ Last-Update: 2014-01-27
ChunkedEncodingError, ContentDecodingError)
--- a/setup.py
+++ b/setup.py
-@@ -16,13 +16,6 @@
-
+@@ -17,12 +17,6 @@
packages = [
'requests',
-- 'requests.packages',
+ 'requests.packages',
- 'requests.packages.chardet',
- 'requests.packages.urllib3',
- 'requests.packages.urllib3.packages',