diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2015-05-03 19:23:48 +0000 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2015-05-03 19:23:48 +0000 |
| commit | 22637d1ab02b9126e98c4226bc02b5b39f21dd29 (patch) | |
| tree | 7cd6a9addb46454ae8ed36f0ceec36ce9398bd3a | |
| parent | 981fc4a37898112d70540f42cd320e6197fdc133 (diff) | |
| download | python-requests-22637d1ab02b9126e98c4226bc02b5b39f21dd29.tar python-requests-22637d1ab02b9126e98c4226bc02b5b39f21dd29.tar.gz | |
Refresh 04_make-requests.packages.urllib3-same-as-urllib3.patch
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/04_make-requests.packages.urllib3-same-as-urllib3.patch | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 05923aa..e114d5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,11 +7,13 @@ requests (2.7.0-1) UNRELEASED; urgency=medium - Use pypi.debian.net redirector. * debian/patches/02_use-system-chardet-and-urllib3.patch - Refresh. + * debian/patches/04_make-requests.packages.urllib3-same-as-urllib3.patch + - Refresh. * debian/python{,3}-requests.links - Remove links thanks to the import machinery in 04_make-requests.packages.urllib3-same-as-urllib3.patch - -- Daniele Tricoli <eriol@mornie.org> Sun, 03 May 2015 21:11:58 +0200 + -- Daniele Tricoli <eriol@mornie.org> Sun, 03 May 2015 21:22:49 +0200 requests (2.4.3-6) unstable; urgency=medium diff --git a/debian/patches/04_make-requests.packages.urllib3-same-as-urllib3.patch b/debian/patches/04_make-requests.packages.urllib3-same-as-urllib3.patch index 4e6f053..0e4db29 100644 --- a/debian/patches/04_make-requests.packages.urllib3-same-as-urllib3.patch +++ b/debian/patches/04_make-requests.packages.urllib3-same-as-urllib3.patch @@ -4,13 +4,13 @@ Author: Jakub Wilk <jwilk@debian.org> Forwarded: not-needed Bug-Debian: https://bugs.debian.org/769047 Bug-Debian: https://bugs.debian.org/769496 -Last-Update: 2014-11-14 +Last-Update: 2015-05-03 --- a/requests/__init__.py +++ b/requests/__init__.py @@ -48,6 +48,28 @@ __license__ = 'Apache 2.0' - __copyright__ = 'Copyright 2014 Kenneth Reitz' + __copyright__ = 'Copyright 2015 Kenneth Reitz' +# On Debian make Python import system know that requests.packages.urllib3 +# and urllib3 are the same thing. |