[Python-modules-commits] r29053 - in packages/python-urllib3/trunk/debian (4 files)

[eriol-guest at users.alioth.debian.org]

    Date: Saturday, May 24, 2014 @ 18:11:00
  Author: eriol-guest
Revision: 29053

Renamed setuptools.patch to 03_force_setuptools.patch

Added:
  packages/python-urllib3/trunk/debian/patches/03_force_setuptools.patch
    (from rev 29042, packages/python-urllib3/trunk/debian/patches/setuptools.patch)
Modified:
  packages/python-urllib3/trunk/debian/changelog
  packages/python-urllib3/trunk/debian/patches/series
Deleted:
  packages/python-urllib3/trunk/debian/patches/setuptools.patch

Modified: packages/python-urllib3/trunk/debian/changelog
===================================================================
--- packages/python-urllib3/trunk/debian/changelog	2014-05-24 17:56:07 UTC (rev 29052)
+++ packages/python-urllib3/trunk/debian/changelog	2014-05-24 18:11:00 UTC (rev 29053)
@@ -7,8 +7,10 @@
     - 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 <eriol at mornie.org>  Sat, 24 May 2014 19:52:20 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Sat, 24 May 2014 20:02:56 +0200
 
 python-urllib3 (1.8-2) unstable; urgency=medium
 

Copied: packages/python-urllib3/trunk/debian/patches/03_force_setuptools.patch (from rev 29042, packages/python-urllib3/trunk/debian/patches/setuptools.patch)
===================================================================
--- packages/python-urllib3/trunk/debian/patches/03_force_setuptools.patch	                        (rev 0)
+++ packages/python-urllib3/trunk/debian/patches/03_force_setuptools.patch	2014-05-24 18:11:00 UTC (rev 29053)
@@ -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

Modified: packages/python-urllib3/trunk/debian/patches/series
===================================================================
--- packages/python-urllib3/trunk/debian/patches/series	2014-05-24 17:56:07 UTC (rev 29052)
+++ packages/python-urllib3/trunk/debian/patches/series	2014-05-24 18:11:00 UTC (rev 29053)
@@ -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

Deleted: packages/python-urllib3/trunk/debian/patches/setuptools.patch
===================================================================
--- packages/python-urllib3/trunk/debian/patches/setuptools.patch	2014-05-24 17:56:07 UTC (rev 29052)
+++ packages/python-urllib3/trunk/debian/patches/setuptools.patch	2014-05-24 18:11:00 UTC (rev 29053)
@@ -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