[Python-modules-commits] [python-activipy] 05/07: merge patched into master

[Wolfgang Borgert]

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

debacle pushed a commit to branch master
in repository python-activipy.

commit f8b726f6e970ddfe7615341bf35cc345e94e4fd6
Merge: 98ee9f7 0c261e8
Author: W. Martin Borgert <debacle at debian.org>
Date:   Mon Nov 23 00:17:26 2015 +0100

    merge patched into master

 activipy/testcli.py                                |  4 +++-
 debian/.git-dpm                                    |  4 ++--
 .../0002-fix-import-and-missing-identifier.patch   | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index ec22db3,0000000..cf8cdb6
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
- aceee5aba257433e569332d51f4f6556d7b3214f
- aceee5aba257433e569332d51f4f6556d7b3214f
++0c261e8ce37a4817665ad4b7713399b6b56e911f
++0c261e8ce37a4817665ad4b7713399b6b56e911f
 +9966f144fb19125b3caca789b9552689c454a0ad
 +9966f144fb19125b3caca789b9552689c454a0ad
 +python-activipy_0.1.orig.tar.gz
 +6ae0de737f301ca04ad22177e1708e0bd1926f7f
 +63727
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-fix-import-and-missing-identifier.patch
index 0000000,0000000..2dcb3d2
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-fix-import-and-missing-identifier.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 0c261e8ce37a4817665ad4b7713399b6b56e911f Mon Sep 17 00:00:00 2001
++From: "W. Martin Borgert" <debacle at debian.org>
++Date: Mon, 23 Nov 2015 00:15:48 +0100
++Subject: fix import and missing identifier
++
++---
++ activipy/testcli.py | 4 +++-
++ 1 file changed, 3 insertions(+), 1 deletion(-)
++
++diff --git a/activipy/testcli.py b/activipy/testcli.py
++index 30e4ba8..35111f1 100644
++--- a/activipy/testcli.py
+++++ b/activipy/testcli.py
++@@ -24,7 +24,9 @@ import sys
++ import argparse
++ from collections import namedtuple, OrderedDict
++ 
++-from .core import Activity, InvalidActivity
+++from .vocab import Activity
+++
+++class InvalidActivity(Exception): pass
++ 
++ class UserError(Exception): pass
++ class InvalidInput(UserError): pass
diff --cc debian/patches/series
index 66c29cc,0000000..e3fb7b2
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-add-missing-encoding-to-sources.patch
++0002-fix-import-and-missing-identifier.patch

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