diff options
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/patches/03_no-setuptools.patch | 26 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 31 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 3788dac..5d3d1c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ python-urllib3 (1.6-1) UNRELEASED; urgency=low * debian/control - Added python3-six to Build-Depends field - Bumped debhelper dependency to 8.1 for build-{arch,indep} support + - Removed python-setuptools from Build-Depends field * debian/copyright - Updated copyright years - Added stanza for urllib3/packages/ordered_dict.py @@ -15,8 +16,10 @@ python-urllib3 (1.6-1) UNRELEASED; urgency=low - Refreshed * debian/patches/02_require-cert-verification.patch - Refreshed + * debian/patches/03_no-setuptools.patch + - Do not use setuptools - -- Daniele Tricoli <eriol@mornie.org> Wed, 08 May 2013 00:51:55 +0200 + -- Daniele Tricoli <eriol@mornie.org> Fri, 10 May 2013 05:33:16 +0200 python-urllib3 (1.5-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 0f661b4..30bf6f0 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Build-Depends: python-all (>= 2.6.6-3), python-coverage (>= 3.4), python-nose (>=1.1.2), - python-setuptools (>= 0.6b3), python-six, python-tornado, python3-all, diff --git a/debian/patches/03_no-setuptools.patch b/debian/patches/03_no-setuptools.patch new file mode 100644 index 0000000..ee2e913 --- /dev/null +++ b/debian/patches/03_no-setuptools.patch @@ -0,0 +1,26 @@ +Description: Do not use setuptools. +Author: Daniele Tricoli <eriol@mornie.org> +Forwarded: not-needed +Last-Update: 2013-05-10 + +--- a/setup.py ++++ b/setup.py +@@ -5,11 +5,6 @@ + import os + import re + +-try: +- import setuptools +-except ImportError: +- pass # No 'develop' command, oh well. +- + base_path = os.path.dirname(__file__) + + # Get the version (borrowed from SQLAlchemy) +@@ -49,6 +44,4 @@ + 'urllib3.contrib', + ], + requires=requirements, +- tests_require=tests_requirements, +- test_suite='test', + ) diff --git a/debian/patches/series b/debian/patches/series index cb492ff..47bcce3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ +03_no-setuptools.patch 01_do-not-use-embedded-python-six.patch 02_require-cert-verification.patch |