merge patched-unstable into unstable

diff --cc debian/.git-dpm
index 30ba91c6a31a54bfb458e6b4a11d291307fca698,0000000000000000000000000000000000000000..e20ef05dd44cd4d39a62c8f9b1297bf13529cb97
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- df906e3e37fa98a1bba12c90bbaabf02615fd457
- df906e3e37fa98a1bba12c90bbaabf02615fd457
 +# see git-dpm(1) from git-dpm package
++66eb3fa3ed269470155b08d63dc848b0760ed48b
++66eb3fa3ed269470155b08d63dc848b0760ed48b
 +df906e3e37fa98a1bba12c90bbaabf02615fd457
 +df906e3e37fa98a1bba12c90bbaabf02615fd457
 +python-iso8601_0.1.4.orig.tar.gz
 +6226b94cf682a47e44cfa99a8a4c1338962e307e
 +3755

diff --cc debian/patches/0001-fixed-issue-with-distutils-that-does-not-work-in-new.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e302f79f0c2dfb6ccce4105bd4fb6c1dc8f47d2e
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0001-fixed-issue-with-distutils-that-does-not-work-in-new.patch
@@@ -1,0 -1,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 --cc debian/patches/series
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..bd063ce383d11ed85b18511265da70a84aa4d624
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-fixed-issue-with-distutils-that-does-not-work-in-new.patch