aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-05-27 17:31:38 +0200
committerDaniele Tricoli <eriol@mornie.org>2015-05-27 17:31:38 +0200
commit49ad641c11f8e0ce36853b58f76e588ab7b98822 (patch)
tree1a0fd1c198c3e47e42d0524a50c2c26c7f9cb400
parent6000d9c7b3f9f44e1cbc875c3f592bac0468f536 (diff)
parent7e07fbb19d3d156fa122e06083b8c550dccb6f17 (diff)
downloadpython-requests-49ad641c11f8e0ce36853b58f76e588ab7b98822.tar
python-requests-49ad641c11f8e0ce36853b58f76e588ab7b98822.tar.gz
Imported Debian patch 2.7.0-2
-rw-r--r--debian/changelog9
-rw-r--r--debian/control1
2 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f5f80d5..6e2eef5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+requests (2.7.0-2) unstable; urgency=medium
+
+ * Upload to unstable.
+ * debian/control
+ - Add httpie (<< 0.9.2) to python-requests' Breaks since constants
+ imported by httpie from requests.compat were removed.
+
+ -- Daniele Tricoli <eriol@mornie.org> Wed, 27 May 2015 17:31:38 +0200
+
requests (2.7.0-1) experimental; urgency=medium
* New upstream release. (Closes: #784095)
diff --git a/debian/control b/debian/control
index a6b2d11..5f5bf22 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,7 @@ Suggests:
python-ndg-httpsclient,
python-openssl,
python-pyasn1
+Breaks: httpie (<< 0.9.2)
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