[Python-modules-commits] [python-activipy] 07/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 2f0a9103ad9de341efab0e175fa85c6b66a833a0
Merge: 14ea2ef 7ecde60
Author: W. Martin Borgert <debacle at debian.org>
Date:   Sun Nov 22 22:41:19 2015 +0100

    merge patched into master

 activipy/__init__.py                               |  1 +
 debian/.git-dpm                                    |  4 ++--
 .../0001-add-missing-encoding-in-setup.py.patch    | 18 --------------
 .../0001-add-missing-encoding-to-sources.patch     | 28 ++++++++++++++++++++++
 debian/patches/series                              |  2 +-
 5 files changed, 32 insertions(+), 21 deletions(-)

diff --cc debian/.git-dpm
index cc8d4db,0000000..0475f50
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
- ea21ccd4f3fcd52dc80a23acd217a7a12c92e90a
- ea21ccd4f3fcd52dc80a23acd217a7a12c92e90a
++7ecde6089a4f306609c5fea9c2893e5d9469bb2c
++7ecde6089a4f306609c5fea9c2893e5d9469bb2c
 +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 0000000,0000000..29ce39e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-add-missing-encoding-to-sources.patch
@@@ -1,0 -1,0 +1,28 @@@
++From 7ecde6089a4f306609c5fea9c2893e5d9469bb2c 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 +
++ setup.py             | 1 +
++ 2 files changed, 2 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/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>
++ ##
diff --cc debian/patches/series
index ff61280,0000000..66c29cc
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- 0001-add-missing-encoding-in-setup.py.patch
++0001-add-missing-encoding-to-sources.patch

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