diff -Nru requests-2.2.1/debian/changelog requests-2.2.1/debian/changelog --- requests-2.2.1/debian/changelog 2015-03-16 11:45:13.000000000 +0000 +++ requests-2.2.1/debian/changelog 2015-03-17 23:40:54.000000000 +0000 @@ -1,3 +1,10 @@ +requests (2.2.1-1ubuntu0.3) trusty-proposed; urgency=medium + + * SRU, update python3.4 for trusty. LP: #1433324. + * Build a -whl package (setuptools is needed to build the wheel package). + + -- Matthias Klose Tue, 17 Mar 2015 23:40:09 +0100 + requests (2.2.1-1ubuntu0.2) trusty-security; urgency=medium * SECURITY UPDATE: Session fixation and cookie stealing issue diff -Nru requests-2.2.1/debian/control requests-2.2.1/debian/control --- requests-2.2.1/debian/control 2014-09-30 22:58:50.000000000 +0000 +++ requests-2.2.1/debian/control 2015-03-17 23:45:04.000000000 +0000 @@ -10,9 +10,12 @@ python-all (>= 2.6.6-3), python-chardet, python-urllib3 (>= 1.7.1), + python-setuptools, python3-all, python3-chardet, - python3-urllib3 (>= 1.7.1) + python3-urllib3 (>= 1.7.1), + python3-setuptools, + python3-wheel Standards-Version: 3.9.5 X-Python-Version: >= 2.7 X-Python3-Version: >= 3.0 @@ -75,3 +78,30 @@ - Connection Timeouts . This package contains the Python 3 version of the library. + +Package: python-requests-whl +Architecture: all +Depends: ca-certificates, + python-urllib3-whl, + ${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 wheel. diff -Nru requests-2.2.1/debian/patches/series requests-2.2.1/debian/patches/series --- requests-2.2.1/debian/patches/series 2015-03-16 11:44:36.000000000 +0000 +++ requests-2.2.1/debian/patches/series 2015-03-17 23:46:15.000000000 +0000 @@ -3,3 +3,4 @@ CVE-2014-1829.patch CVE-2014-1830.patch CVE-2015-2296.patch +use-setuptools-for-wheel-only.diff diff -Nru requests-2.2.1/debian/patches/use-setuptools-for-wheel-only.diff requests-2.2.1/debian/patches/use-setuptools-for-wheel-only.diff --- requests-2.2.1/debian/patches/use-setuptools-for-wheel-only.diff 1970-01-01 00:00:00.000000000 +0000 +++ requests-2.2.1/debian/patches/use-setuptools-for-wheel-only.diff 2015-03-17 23:47:11.000000000 +0000 @@ -0,0 +1,18 @@ +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -5,9 +5,11 @@ + + import requests + +-try: ++# just build the wheel using setuptools ++import os ++if os.getenv("USE_SETUPTOOLS") == "yes": + from setuptools import setup +-except ImportError: ++else: + from distutils.core import setup + + if sys.argv[-1] == 'publish': diff -Nru requests-2.2.1/debian/python-requests-whl.install requests-2.2.1/debian/python-requests-whl.install --- requests-2.2.1/debian/python-requests-whl.install 1970-01-01 00:00:00.000000000 +0000 +++ requests-2.2.1/debian/python-requests-whl.install 2015-03-17 23:45:58.000000000 +0000 @@ -0,0 +1 @@ +usr/share/python-wheels diff -Nru requests-2.2.1/debian/rules requests-2.2.1/debian/rules --- requests-2.2.1/debian/rules 2013-10-21 19:57:14.000000000 +0000 +++ requests-2.2.1/debian/rules 2015-03-17 23:47:24.000000000 +0000 @@ -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 + USE_SETUPTOOLS=yes python3 setup.py bdist_wheel \ + --universal \ + -d $(CURDIR)/debian/tmp/usr/share/python-wheels