diff -Nru six-1.5.2/debian/changelog six-1.5.2/debian/changelog --- six-1.5.2/debian/changelog 2014-01-07 01:00:51.000000000 +0000 +++ six-1.5.2/debian/changelog 2018-10-10 17:55:31.000000000 +0000 @@ -1,3 +1,16 @@ +six (1.5.2-1ubuntu1.1) trusty-security; urgency=medium + + * No change rebuild in -security pocket. + + -- Leonidas S. Barbosa Wed, 10 Oct 2018 14:54:48 -0300 + +six (1.5.2-1ubuntu1) 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 Sat, 26 Jul 2014 21:55:03 +0200 + six (1.5.2-1) unstable; urgency=medium * New upstream release. diff -Nru six-1.5.2/debian/control six-1.5.2/debian/control --- six-1.5.2/debian/control 2014-01-07 01:00:21.000000000 +0000 +++ six-1.5.2/debian/control 2018-10-10 17:55:37.000000000 +0000 @@ -1,12 +1,14 @@ Source: six Section: python Priority: optional -Maintainer: Colin Watson +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Colin Watson +Uploaders: Barry Warsaw Standards-Version: 3.9.5 -Build-Depends: debhelper (>= 7.2.11~), python (>= 2.6.6-3~), python-all, python3 (>= 3.1.2-8~), python3-all, python-pytest, python3-pytest +Build-Depends: debhelper (>= 7.2.11~), python (>= 2.6.6-3~), python-all, python3 (>= 3.1.2-8~), python3-all, python-pytest, python3-pytest, python-setuptools, python3-setuptools, python3-wheel, dh-python Homepage: http://pythonhosted.org/six/ -Vcs-Git: git://anonscm.debian.org/users/cjwatson/six.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/cjwatson/six.git +Vcs-Git: git://anonscm.debian.org/collab-maint/six.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/six.git X-Python-Version: >= 2.5 X-Python3-Version: >= 3.0 @@ -33,3 +35,14 @@ . This package provides Six on the Python 3 module path. It is complemented by python-six. + +Package: python-six-whl +Architecture: all +Depends: ${misc:Depends}, ${python3:Depends} +Description: Python 2 and 3 compatibility library (universal wheel) + Six is a Python 2 and 3 compatibility library. It provides utility + functions for smoothing over the differences between the Python versions + with the goal of writing Python code that is compatible on both Python + versions. + . + This package provides Six as a universal wheel. diff -Nru six-1.5.2/debian/patches/series six-1.5.2/debian/patches/series --- six-1.5.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ six-1.5.2/debian/patches/series 2015-03-17 23:14:50.000000000 +0000 @@ -0,0 +1 @@ +use-setuptools-for-wheel-only.diff diff -Nru six-1.5.2/debian/patches/use-setuptools-for-wheel-only.diff six-1.5.2/debian/patches/use-setuptools-for-wheel-only.diff --- six-1.5.2/debian/patches/use-setuptools-for-wheel-only.diff 1970-01-01 00:00:00.000000000 +0000 +++ six-1.5.2/debian/patches/use-setuptools-for-wheel-only.diff 2015-03-17 23:15:33.000000000 +0000 @@ -0,0 +1,17 @@ +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -1,8 +1,10 @@ + from __future__ import with_statement + +-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 + + import six diff -Nru six-1.5.2/debian/python3-six.install six-1.5.2/debian/python3-six.install --- six-1.5.2/debian/python3-six.install 2014-01-07 00:26:11.000000000 +0000 +++ six-1.5.2/debian/python3-six.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/python3 diff -Nru six-1.5.2/debian/python-six.install six-1.5.2/debian/python-six.install --- six-1.5.2/debian/python-six.install 2014-01-07 00:26:11.000000000 +0000 +++ six-1.5.2/debian/python-six.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/python2.* diff -Nru six-1.5.2/debian/python-six-whl.install six-1.5.2/debian/python-six-whl.install --- six-1.5.2/debian/python-six-whl.install 1970-01-01 00:00:00.000000000 +0000 +++ six-1.5.2/debian/python-six-whl.install 2014-07-26 19:58:05.000000000 +0000 @@ -0,0 +1 @@ +usr/share/python-wheels diff -Nru six-1.5.2/debian/rules six-1.5.2/debian/rules --- six-1.5.2/debian/rules 2014-01-07 00:26:11.000000000 +0000 +++ six-1.5.2/debian/rules 2015-03-17 23:15:59.000000000 +0000 @@ -1,26 +1,15 @@ #! /usr/bin/make -f -%: - dh $@ --with python2,python3 -override_dh_auto_build: - dh_auto_build - set -e; for python in $$(py3versions -r); do \ - $$python setup.py build; \ - done +export PYBUILD_NAME=six +export PYBUILD_TEST_PYTEST=1 + -override_dh_auto_test: - py.test -v - py.test-3 -v +%: + dh $@ --with python2,python3 --buildsystem=pybuild -override_dh_auto_clean: - dh_auto_clean - find -name \*.pyc -print0 | xargs -0r rm -f - find -name __pycache__ -print0 | xargs -0r rm -rf - rm -rf build override_dh_auto_install: dh_auto_install - set -e; for python in $$(py3versions -r); do \ - $$python setup.py install --root=$(CURDIR)/debian/tmp \ - --no-compile -O0 --install-layout=deb; \ - done + USE_SETUPTOOLS=yes python3 setup.py bdist_wheel \ + --universal \ + -d $(CURDIR)/debian/tmp/usr/share/python-wheels