aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2015-12-22 14:02:55 +0000
committerChristopher Baines <mail@cbaines.net>2015-12-22 14:02:56 +0000
commitd222277ea3303ea2408baec2cf1873d8e0dfb56b (patch)
tree2cc2c619309a61dfecfc6c0b5020106174556b2a /debian
parent79f51e45f74dd32f9c1a103150ded9d575f5f94c (diff)
parent12a013173d4175a3dcbe728128a63a399358bf6f (diff)
downloadpython-requests-master.tar
python-requests-master.tar.gz
merge patched into masterHEADmaster
Diffstat (limited to 'debian')
-rw-r--r--debian/.git-dpm4
-rw-r--r--debian/patches/02_populate-install_requires.patch6
2 files changed, 5 insertions, 5 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 7b542de..b247795 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-08c16e06ad11c6fcb26f4ca1ea3f11093598092f
-08c16e06ad11c6fcb26f4ca1ea3f11093598092f
+12a013173d4175a3dcbe728128a63a399358bf6f
+12a013173d4175a3dcbe728128a63a399358bf6f
1f19c06843e6d266368e3b570352bdf7d789a0de
1f19c06843e6d266368e3b570352bdf7d789a0de
requests_2.9.1.orig.tar.gz
diff --git a/debian/patches/02_populate-install_requires.patch b/debian/patches/02_populate-install_requires.patch
index 0e71c16..962c790 100644
--- a/debian/patches/02_populate-install_requires.patch
+++ b/debian/patches/02_populate-install_requires.patch
@@ -1,4 +1,4 @@
-From 08c16e06ad11c6fcb26f4ca1ea3f11093598092f Mon Sep 17 00:00:00 2001
+From 12a013173d4175a3dcbe728128a63a399358bf6f Mon Sep 17 00:00:00 2001
From: Daniele Tricoli <eriol@mornie.org>
Date: Fri, 23 Oct 2015 16:03:52 +0200
Subject: Populate install_requires for unbundled packages
@@ -15,7 +15,7 @@ Patch-Name: 02_populate-install_requires.patch
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
-index c483535..5e75b98 100755
+index c483535..2648a3a 100755
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,9 @@ packages = [
@@ -24,7 +24,7 @@ index c483535..5e75b98 100755
-requires = []
+requires = [
-+ 'urllib3==1.12',
++ 'urllib3==1.13.1',
+]
version = ''