Imported Debian patch 2.2.1-2

4 files changed, 77 insertions, 31 deletions

diff --git a/debian/changelog b/debian/changelog
index af156b4..7b1d209 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+requests (2.2.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * debian/control
+    - Add python-requests-whl binary package.
+    - Build-Depends on python3-wheel, python-setuptools,
+      and python3-setuptools.
+    - wrap-and-sort.
+  * debian/rules:
+    - Simplify by using PYBUILD_NAME.
+    - Build the universal wheels.
+
+ -- Barry Warsaw <barry@debian.org>  Thu, 15 May 2014 17:09:30 -0400
+
 requests (2.2.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index c6b855f..d3b705b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,17 @@ 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-urllib3 (>= 1.7.1),
- python3-all,
- python3-chardet,
- python3-urllib3 (>= 1.7.1)
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               python-all (>= 2.6.6-3),
+               python-chardet,
+               python-setuptools,
+               python-urllib3 (>= 1.7.1),
+               python3-all,
+               python3-chardet,
+               python3-setuptools,
+               python3-urllib3 (>= 1.7.1),
+               python3-wheel
 Standards-Version: 3.9.5
 X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.0
@@ -21,17 +23,16 @@ Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/requests/t
 
 Package: python-requests
 Architecture: all
-Depends:
- ${misc:Depends},
- ${python:Depends},
- ca-certificates,
- python-chardet,
- python-urllib3 (>= 1.7.1),
+Depends: ca-certificates,
+         python-chardet,
+         python-urllib3 (>= 1.7.1),
+         ${misc:Depends},
+         ${python:Depends}
 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 the
- response data in the same way. It's powered by httplib and urllib3, but it does
- all the hard work and crazy hacks for you.
+ multipart files, and parameters with simple Python dictionaries, and access
+ the response data in the same way. It's powered by httplib and urllib3, but
+ it does all the hard work and crazy hacks for you.
  .
  Features
  .
@@ -48,17 +49,16 @@ Description: elegant and simple HTTP library for Python, built for human beings
 
 Package: python3-requests
 Architecture: all
-Depends:
- ${misc:Depends},
- ${python3:Depends},
- ca-certificates,
- python3-chardet,
- python3-urllib3 (>= 1.5)
-Description: elegant and simple HTTP library for Python3, built for human beings
+Depends: ca-certificates,
+         python3-chardet,
+         python3-urllib3 (>= 1.5),
+         ${misc:Depends},
+         ${python3:Depends}
+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 the
- response data in the same way. It's powered by httplib and urllib3, but it does
- all the hard work and crazy hacks for you.
+ multipart files, and parameters with simple Python dictionaries, and access
+ the response data in the same way. It's powered by httplib and urllib3, but
+ it does all the hard work and crazy hacks for you.
  .
  Features
  .
@@ -74,3 +74,30 @@ Description: elegant and simple HTTP library for Python3, built for human beings
    - Connection Timeouts
  .
  This package contains the Python 3 version of the library.
+
+Package: python-requests-whl
+Architecture: all
+Depends: ca-certificates,
+         python-urllib3-wheels,
+         ${misc:Depends},
+         ${python3:Depends}
+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
+ the response data in the same way. It's powered by httplib and urllib3, but
+ it does all the hard work and crazy hacks for you.
+ .
+ Features
+ .
+   - International Domains and URLs
+   - Keep-Alive & Connection Pooling
+   - Sessions with Cookie Persistence
+   - Browser-style SSL Verification
+   - Basic/Digest Authentication
+   - Elegant Key/Value Cookies
+   - Automatic Decompression
+   - Unicode Response Bodies
+   - Multipart File Uploads
+   - Connection Timeouts
+ .
+ This package provides the universal wheels.
diff --git a/debian/python-requests-whl.install b/debian/python-requests-whl.install
new file mode 100644
index 0000000..fd3f06f
--- /dev/null
+++ b/debian/python-requests-whl.install
@@ -0,0 +1 @@
+usr/share/python-wheels
diff --git a/debian/rules b/debian/rules
index 6198313..c9d82a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,15 @@
 #!/usr/bin/make -f
 
-export PYBUILD_DESTDIR_python2=debian/python-requests/
-export PYBUILD_DESTDIR_python3=debian/python3-requests/
-
+export PYBUILD_NAME=requests
 
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
 
 override_dh_installchangelogs:
 	dh_installchangelogs HISTORY.rst
+
+override_dh_auto_install:
+	dh_auto_install
+	python3 setup.py bdist_wheel \
+		--universal \
+		-d $(CURDIR)/debian/tmp/usr/share/python-wheels