Updated patch to match policy.  Primary difference from previous patch is the
use of -whl suffix on binary package name.

This one is ready for upload.
=== modified file 'debian/changelog'
--- debian/changelog	2014-03-29 01:52:42 +0000
+++ debian/changelog	2014-05-20 18:43:10 +0000
@@ -1,3 +1,16 @@
+distlib (0.1.8-2) UNRELEASED; urgency=medium
+
+  * d/control:
+    - Added python-setuptools, python3-setuptools, python3-wheels to
+      Build-Depends. 
+    - Added python-distlib-whl binary package.
+  * d/rules: Build the universal wheel.  (Closes: #748301)
+  * d/patches/setuptools.diff: Patch setup.py to use
+    setuptools.setup() so that the bdist_wheel command will work.
+  * d/python-distlib-whl.install: Added.
+
+ -- Barry Warsaw <[email protected]>  Mon, 12 May 2014 16:12:37 -0400
+
 distlib (0.1.8-1) unstable; urgency=medium
 
   * New upstream version.

=== modified file 'debian/control'
--- debian/control	2014-03-29 01:52:42 +0000
+++ debian/control	2014-05-20 18:29:58 +0000
@@ -2,7 +2,8 @@
 Section: python
 Priority: optional
 Maintainer: Matthias Klose <[email protected]>
-Build-Depends: debhelper (>= 9), python-all, python3-all, dh-python
+Build-Depends: debhelper (>= 9), python-all, python3-all, dh-python,
+               python-setuptools, python3-setuptools, python3-wheel
 Standards-Version: 3.9.5
 Homepage: https://pypi.python.org/pypi/distlib
 
@@ -21,3 +22,13 @@
  Distlib is a library which implements low-level functions that relate to
  packaging and distribution of Python software. It is intended to be used
  as the basis for third-party packaging tools.
+
+Package: python-distlib-whl
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Description: low-level components of python distutils2/packaging
+ Distlib is a library which implements low-level functions that relate to
+ packaging and distribution of Python software. It is intended to be used
+ as the basis for third-party packaging tools.
+ .
+ This package provides the universal wheels.

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-29 01:52:42 +0000
+++ debian/patches/series	2014-05-20 18:27:48 +0000
@@ -1,1 +1,2 @@
 no-binaries.diff
+setuptools.diff

=== added file 'debian/patches/setuptools.diff'
--- debian/patches/setuptools.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/setuptools.diff	2014-05-20 18:27:48 +0000
@@ -0,0 +1,23 @@
+Description: Use setuptools.setup() in order to allow the bdist_wheel command.
+Author: Barry Warsaw <[email protected]>
+Forwarded: not-needed
+
+--- a/setup.py
++++ b/setup.py
+@@ -5,6 +5,7 @@
+ # See LICENSE.txt and CONTRIBUTORS.txt.
+ #
+ 
++import setuptools
+ import distutils.core
+ from distutils.sysconfig import get_python_lib
+ from os.path import join, dirname, abspath
+@@ -31,7 +32,7 @@
+     def finalize_options(self):
+         pass
+ 
+-distutils.core.setup(
++setuptools.setup(
+     name='distlib',
+     version=distlib.__version__,
+     author='Vinay Sajip',

=== added file 'debian/python-distlib-whl.install'
--- debian/python-distlib-whl.install	1970-01-01 00:00:00 +0000
+++ debian/python-distlib-whl.install	2014-05-20 18:27:48 +0000
@@ -0,0 +1,1 @@
+usr/share/python-wheels

=== modified file 'debian/rules'
--- debian/rules	2014-03-29 01:52:42 +0000
+++ debian/rules	2014-05-20 18:27:48 +0000
@@ -6,3 +6,9 @@
 
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
+
+override_dh_auto_install:
+	dh_auto_install
+	python3 setup.py bdist_wheel \
+		--universal \
+		-d $(CURDIR)/debian/tmp/usr/share/python-wheels

Reply via email to