From 9a75888c602026604defb891768e21a4c21f7565 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Sat, 24 May 2014 18:11:00 +0000 Subject: Renamed setuptools.patch to 03_force_setuptools.patch --- debian/changelog | 4 +++- debian/patches/03_force_setuptools.patch | 10 ++++++++++ debian/patches/series | 2 +- debian/patches/setuptools.patch | 10 ---------- 4 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 debian/patches/03_force_setuptools.patch delete mode 100644 debian/patches/setuptools.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b8d3ce6..df098f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,10 @@ python-urllib3 (1.8.2-1) UNRELEASED; urgency=medium - Refreshed * debian/patches/03_no-setuptools.patch - Superseded by debian/patches/setuptools.patch + * debian/patches/03_force-setuptools.patch + - Renamed from setuptools.patch - -- Daniele Tricoli Sat, 24 May 2014 19:52:20 +0200 + -- Daniele Tricoli Sat, 24 May 2014 20:02:56 +0200 python-urllib3 (1.8-2) unstable; urgency=medium diff --git a/debian/patches/03_force_setuptools.patch b/debian/patches/03_force_setuptools.patch new file mode 100644 index 0000000..ff8f7e9 --- /dev/null +++ b/debian/patches/03_force_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/patches/series b/debian/patches/series index a8d7977..8570821 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ 01_do-not-use-embedded-python-six.patch 02_require-cert-verification.patch +03_force_setuptools.patch 04_relax_nosetests_options.patch -setuptools.patch diff --git a/debian/patches/setuptools.patch b/debian/patches/setuptools.patch deleted file mode 100644 index ff8f7e9..0000000 --- a/debian/patches/setuptools.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 -- cgit v1.2.3