[Python-modules-commits] [python-xapian-haystack] 04/05: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository python-xapian-haystack.

commit 28eb117a289aa7a6359527e5021fcc02fb2deb26
Merge: 6ec40b5 e7435bc
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sun Mar 19 20:32:45 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...io.open-to-read-UTF-8-encoded-README-file.patch | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  3 ++-
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 007bec1,0000000..8cdbddd
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 9a3a35f65f69e9eb7359b82f6bd2bb938e9a56c4
- 9a3a35f65f69e9eb7359b82f6bd2bb938e9a56c4
++e7435bc6d9145add99586c4d7c38fd141ceee898
++e7435bc6d9145add99586c4d7c38fd141ceee898
 +9a3a35f65f69e9eb7359b82f6bd2bb938e9a56c4
 +9a3a35f65f69e9eb7359b82f6bd2bb938e9a56c4
 +python-xapian-haystack_2.1.0.orig.tar.gz
 +98d4983f93e6e1d7ebe2cd46111991bb32abe413
 +36424
diff --cc debian/patches/0001-Use-io.open-to-read-UTF-8-encoded-README-file.patch
index 0000000,0000000..89f6558
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-io.open-to-read-UTF-8-encoded-README-file.patch
@@@ -1,0 -1,0 +1,27 @@@
++From e7435bc6d9145add99586c4d7c38fd141ceee898 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Sun, 19 Mar 2017 20:32:37 +0100
++Subject: Use io.open to read UTF-8 encoded README file.
++
++---
++ setup.py | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 517b445..2506306 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -2,11 +2,12 @@
++ from __future__ import unicode_literals
++ 
++ import os
+++import io
++ from distutils.core import setup
++ 
++ 
++ def read(fname):
++-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+++    return io.open(os.path.join(os.path.dirname(__file__), fname), encoding='utf-8').read()
++ 
++ setup(
++     name='xapian-haystack',
diff --cc debian/patches/series
index 0000000,0000000..2239ad9
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-io.open-to-read-UTF-8-encoded-README-file.patch

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