[Python-modules-commits] [python-activipy] 11/11: 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 c46ae3ce4bf6a018439513ac703285d723f25650
Merge: 1545145 50969c7
Author: W. Martin Borgert <debacle at debian.org>
Date:   Sun Nov 22 22:45:09 2015 +0100

    merge patched into master

 activipy/core.py                                          |  1 +
 debian/.git-dpm                                           |  4 ++--
 debian/patches/0001-add-missing-encoding-to-sources.patch | 14 ++++++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 279fe38,0000000..563afdf
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
- 8ecc3cdcb7a5078f670e3c13ecfabe57f4741b7c
- 8ecc3cdcb7a5078f670e3c13ecfabe57f4741b7c
++50969c7dbdeb3588f9bd9dd4c605754944fb8ecc
++50969c7dbdeb3588f9bd9dd4c605754944fb8ecc
 +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/0001-add-missing-encoding-to-sources.patch
index 5fd1f2a,0000000..b86e498
mode 100644,000000..100644
--- a/debian/patches/0001-add-missing-encoding-to-sources.patch
+++ b/debian/patches/0001-add-missing-encoding-to-sources.patch
@@@ -1,38 -1,0 +1,48 @@@
- From 8ecc3cdcb7a5078f670e3c13ecfabe57f4741b7c Mon Sep 17 00:00:00 2001
++From 50969c7dbdeb3588f9bd9dd4c605754944fb8ecc Mon Sep 17 00:00:00 2001
 +From: "W. Martin Borgert" <debacle at debian.org>
 +Date: Sun, 22 Nov 2015 22:40:43 +0100
 +Subject: add missing encoding to sources
 +
 +---
 + activipy/__init__.py | 1 +
++ activipy/core.py     | 1 +
 + activipy/testcli.py  | 1 +
 + setup.py             | 1 +
-  3 files changed, 3 insertions(+)
++ 4 files changed, 4 insertions(+)
 +
 +diff --git a/activipy/__init__.py b/activipy/__init__.py
 +index 8ddef0c..363dae8 100644
 +--- a/activipy/__init__.py
 ++++ b/activipy/__init__.py
 +@@ -1,3 +1,4 @@
 ++# coding=utf-8
 + ## Activipy --- ActivityStreams 2.0 implementation and validator for Python
 + ## Copyright © 2015 Christopher Allan Webber <cwebber at dustycloud.org>
 + ##
++diff --git a/activipy/core.py b/activipy/core.py
++index 7c7f2c7..a01136b 100644
++--- a/activipy/core.py
+++++ b/activipy/core.py
++@@ -1,3 +1,4 @@
+++# coding=utf-8
++ ## Activipy --- ActivityStreams 2.0 implementation and validator for Python
++ ## Copyright © 2015 Christopher Allan Webber <cwebber at dustycloud.org>
++ ##
 +diff --git a/activipy/testcli.py b/activipy/testcli.py
 +index 48dad40..30e4ba8 100644
 +--- a/activipy/testcli.py
 ++++ b/activipy/testcli.py
 +@@ -1,3 +1,4 @@
 ++# coding=utf-8
 + ## Activipy --- ActivityStreams 2.0 implementation and validator for Python
 + ## Copyright © 2015 Christopher Allan Webber <cwebber at dustycloud.org>
 + ##
 +diff --git a/setup.py b/setup.py
 +index b7ac6e6..b8c2c43 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -1,3 +1,4 @@
 ++# coding=utf-8
 + ## Activipy --- ActivityStreams 2.0 implementation and testing for Python
 + ## Copyright © 2015  Christopher Allan Webber <cwebber at dustycloud.org>
 + ##

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