[Python-modules-commits] [python-iso8601] 04/10: merge patched into master

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository python-iso8601.

commit b901e5821839f6dbc86e832cf4879c98d4392bd9
Merge: 40e5e9e 31acbbc
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Wed Nov 18 21:04:37 2015 +0200

    merge patched into master

 LICENSE                                        |  2 +-
 PKG-INFO                                       | 22 ++++++++++++++++++----
 README.rst                                     | 20 +++++++++++++++++---
 debian/.git-dpm                                |  6 +++---
 debian/patches/0001-fix-broken-distutils.patch |  4 ++--
 dev-requirements.txt                           |  1 +
 iso8601.egg-info/PKG-INFO                      | 22 ++++++++++++++++++----
 iso8601/iso8601.py                             | 23 +++++++++++++++--------
 iso8601/test_iso8601.py                        |  1 +
 setup.cfg                                      |  2 +-
 setup.py                                       |  2 +-
 tox.ini                                        |  2 +-
 12 files changed, 79 insertions(+), 28 deletions(-)

diff --cc debian/.git-dpm
index 2b3ba0c,0000000..26041fc
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- aff8eea323300be65ef8800a1507bc2338e0d6b2
- aff8eea323300be65ef8800a1507bc2338e0d6b2
- 1a90ad5e79b2a5298d42a38308019e281bfc95c5
++31acbbc79edc6240b0c48b009994c517c87ff54d
++31acbbc79edc6240b0c48b009994c517c87ff54d
++f7278b93132c94895db96c10da282a51fe43bca7
 +f7278b93132c94895db96c10da282a51fe43bca7
 +python-iso8601_0.1.11.orig.tar.gz
 +d7af90c7f01c8b62a9d8c0bf26badf2a903ccf70
 +8725
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-fix-broken-distutils.patch
index 862b0d0,0000000..4582dbe
mode 100644,000000..100644
--- a/debian/patches/0001-fix-broken-distutils.patch
+++ b/debian/patches/0001-fix-broken-distutils.patch
@@@ -1,22 -1,0 +1,22 @@@
- From aff8eea323300be65ef8800a1507bc2338e0d6b2 Mon Sep 17 00:00:00 2001
++From 31acbbc79edc6240b0c48b009994c517c87ff54d Mon Sep 17 00:00:00 2001
 +From: Benjamin Mako Hill <mako at debian.org>
 +Date: Thu, 28 Aug 2014 10:52:33 -0700
 +Subject: fix-broken-distutils
 +
 +---
 + setup.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/setup.py b/setup.py
- index 3e60572..04bbe06 100644
++index e9dc75d..0f89976 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -3,7 +3,7 @@ import os
 + try:
 +     from setuptools import setup
 + except ImportError:
 +-    from distutils import setup
 ++    from distutils.core import setup
 + 
 + long_description = open(os.path.join(os.path.dirname(__file__), "README.rst")).read()
 + 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-iso8601.git