6 files changed, 56 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index dd301bb..e7286ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 python-urllib3 (1.8-1) UNRELEASED; urgency=medium
 
+  [ Daniele Tricoli ]
   * New upstream release
   * debian/control
     - Bumped Standards-Version to 3.9.5 (no changes needed)
@@ -8,7 +9,19 @@ python-urllib3 (1.8-1) UNRELEASED; urgency=medium
   * debian/patches/02_require-cert-verification.patch
     - Refreshed
 
- -- Daniele Tricoli <eriol@mornie.org>  Mon, 31 Mar 2014 19:16:24 +0200
+  [ Barry Warsaw ]
+  * d/control:
+    - Added python-setuptools, python3-setuptools, and python3-wheel to
+      Build-Depends.
+    - Added python-urllib3-wheels binary package.
+  * d/rules:
+    - Build the universal wheels.
+    - Simplify through use of PYBUILD_NAME.
+  * d/python-urllib3-wheels.install: Added.
+  * d/patches/setuptools.patch: Use setuptools.setup() so that the
+    bdist_wheel command will work.
+
+ -- Barry Warsaw <barry@debian.org>  Mon, 12 May 2014 20:54:11 -0400
 
 python-urllib3 (1.7.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3f59548..f0f51ef 100644
--- a/debian/control
+++ b/debian/control
@@ -10,10 +10,13 @@ Build-Depends:
  python-coverage (>= 3.4),
  python-mock,
  python-nose (>=1.1.2),
+ python-setuptools,
  python-six,
  python-tornado,
  python3-all,
+ python3-setuptools,
  python3-six,
+ python3-wheel,
 Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.0
@@ -64,3 +67,26 @@ Description: HTTP library with thread-safe connection pooling for Python3
      building upon.
  .
  This package contains the Python 3 version of the library.
+
+Package: python-urllib3-wheels
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
+ python3-six-wheels
+Recommends:
+ ca-certificates
+Description: HTTP library with thread-safe connection pooling
+ urllib3 supports features left out of urllib and urllib2 libraries.
+ .
+   - Re-use the same socket connection for multiple requests (HTTPConnectionPool
+     and HTTPSConnectionPool) (with optional client-side certificate
+     verification).
+   - File posting (encode_multipart_formdata).
+   - Built-in redirection and retries (optional).
+   - Supports gzip and deflate decoding.
+   - Thread-safe and sanity-safe.
+   - Small and easy to understand codebase perfect for extending and
+     building upon.
+ .
+ This package contains the universal wheels.
diff --git a/debian/patches/series b/debian/patches/series
index e276627..52e03c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_require-cert-verification.patch
 03_no-setuptools.patch
 04_relax_nosetests_options.patch
+setuptools.patch
diff --git a/debian/patches/setuptools.patch b/debian/patches/setuptools.patch
new file mode 100644
index 0000000..ff8f7e9
--- /dev/null
+++ b/debian/patches/setuptools.patch
@@ -0,0 +1,10 @@
+--- a/setup.py
++++ b/setup.py
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env python
+ 
+-from distutils.core import setup
++from setuptools import setup
+ 
+ import os
+ import re
diff --git a/debian/python-urllib3-wheels.install b/debian/python-urllib3-wheels.install
new file mode 100644
index 0000000..fd3f06f
--- /dev/null
+++ b/debian/python-urllib3-wheels.install
@@ -0,0 +1 @@
+usr/share/python-wheels
diff --git a/debian/rules b/debian/rules
index 42f5d36..f3dea6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
-export PYBUILD_DESTDIR_python2=debian/python-urllib3/
-export PYBUILD_DESTDIR_python3=debian/python3-urllib3/
+export PYBUILD_NAME=urllib3
 export PYTHONWARNINGS=d
 
 
@@ -15,6 +14,9 @@ override_dh_auto_install:
 	dh_auto_install
 	# Remove dummyserver/ tests to not pollute namespace.
 	rm -rf debian/python*-urllib3/usr/lib/python*/dist-packages/dummyserver
+	python3 setup.py bdist_wheel \
+		--universal \
+		-d $(CURDIR)/debian/tmp/usr/share/python-wheels
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))