[Python-modules-commits] [python-activipy] 02/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 8783c93ae369baa73aa3455411198777e531f8a8
Merge: ffe1c9a aceee5a
Author: W. Martin Borgert <debacle at debian.org>
Date:   Sun Nov 22 23:59:49 2015 +0100

    merge patched into master

 activipy/tests/test_core.py                        |  1 +
 activipy/vocab.py                                  |  1 +
 debian/.git-dpm                                    |  4 +--
 .../0001-add-missing-encoding-to-sources.patch     | 32 ++++++++++++++++++----
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 563afdf,0000000..ec22db3
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
- 50969c7dbdeb3588f9bd9dd4c605754944fb8ecc
- 50969c7dbdeb3588f9bd9dd4c605754944fb8ecc
++aceee5aba257433e569332d51f4f6556d7b3214f
++aceee5aba257433e569332d51f4f6556d7b3214f
 +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 b86e498,0000000..9d1b698
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,48 -1,0 +1,68 @@@
- From 50969c7dbdeb3588f9bd9dd4c605754944fb8ecc Mon Sep 17 00:00:00 2001
++From aceee5aba257433e569332d51f4f6556d7b3214f 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 +
-  4 files changed, 4 insertions(+)
++ activipy/__init__.py        | 1 +
++ activipy/core.py            | 1 +
++ activipy/testcli.py         | 1 +
++ activipy/tests/test_core.py | 1 +
++ activipy/vocab.py           | 1 +
++ setup.py                    | 1 +
++ 6 files changed, 6 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/activipy/tests/test_core.py b/activipy/tests/test_core.py
++index be3baf4..363e8de 100644
++--- a/activipy/tests/test_core.py
+++++ b/activipy/tests/test_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/vocab.py b/activipy/vocab.py
++index 55c6418..66c6786 100644
++--- a/activipy/vocab.py
+++++ b/activipy/vocab.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>
++ ##
 +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