merge patched-unstable into unstable

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 30ba91c6a31a54bfb458e6b4a11d291307fca698..e20ef05dd44cd4d39a62c8f9b1297bf13529cb97 100644 (file)
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-df906e3e37fa98a1bba12c90bbaabf02615fd457
-df906e3e37fa98a1bba12c90bbaabf02615fd457
+66eb3fa3ed269470155b08d63dc848b0760ed48b
+66eb3fa3ed269470155b08d63dc848b0760ed48b
 df906e3e37fa98a1bba12c90bbaabf02615fd457
 df906e3e37fa98a1bba12c90bbaabf02615fd457
 python-iso8601_0.1.4.orig.tar.gz

diff --git a/debian/patches/0001-fixed-issue-with-distutils-that-does-not-work-in-new.patch b/debian/patches/0001-fixed-issue-with-distutils-that-does-not-work-in-new.patch
new file mode 100644 (file)
index 0000000..e302f79
--- /dev/null
+++ b/debian/patches/0001-fixed-issue-with-distutils-that-does-not-work-in-new.patch
@@ -0,0 +1,25 @@
+From 66eb3fa3ed269470155b08d63dc848b0760ed48b Mon Sep 17 00:00:00 2001
+From: Benjamin Mako Hill <mako@atdot.cc>
+Date: Fri, 11 Feb 2011 14:22:11 -0500
+Subject: fixed issue with distutils that does not work in new version of python
+
+---
+ setup.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index cdb61ec..2daf5b1 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,7 +1,7 @@
+ try:
+     from setuptools import setup
+ except ImportError:
+-    from distutils import setup
++    from distutils.core import setup
+ 
+ long_description="""Simple module to parse ISO 8601 dates
+ 
+-- 
+1.7.2.3
+

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..bd063ce
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-fixed-issue-with-distutils-that-does-not-work-in-new.patch

diff --git a/setup.py b/setup.py
index cdb61ecf6a81079469cd3341bf2c0bd4731b4991..2daf5b133028f78d87686dc1d49ac0d12daeb7cb 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 try:
     from setuptools import setup
 except ImportError:
-    from distutils import setup
+    from distutils.core import setup
 
 long_description="""Simple module to parse ISO 8601 dates