merge patched into master

[python-simplemediawiki.debian] / debian / patches / 0007-use-setuptools-if-available.patch

diff --git a/debian/patches/0007-use-setuptools-if-available.patch b/debian/patches/0007-use-setuptools-if-available.patch
new file mode 100644 (file)
index 0000000..aae8aa0
--- /dev/null
+++ b/debian/patches/0007-use-setuptools-if-available.patch
@@ -0,0 +1,32 @@
+From b1031465666db28694e2eb69c81d9ce33857f09a Mon Sep 17 00:00:00 2001
+From: Benjamin Mako Hill <mako@atdot.cc>
+Date: Mon, 9 Apr 2012 18:13:37 -0400
+Subject: use setuptools if available
+
+---
+ setup.py |    8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 79a2b1e..fb1768e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,4 +1,8 @@
+-from distutils.core import setup
++try:
++    from setuptools import setup
++except ImportError:
++    from distutils.core import setup
++
+ setup(name='simplemediawiki',
+       version='1.0.2',
+       description='Extremely low-level wrapper to the MediaWiki API',
+@@ -11,7 +15,7 @@ setup(name='simplemediawiki',
+           'License :: OSI Approved :: GNU Library or Lesser General Public '
+           'License (LGPL)',
+       ],
+-      requires=[
++      install_requires=[
+           'iso8601',
+       ],
+       py_modules=['simplemediawiki'])