[Python-modules-commits] [python-websockets] 06/08: merge patched into master

[Piotr Ożarowski]

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

piotr pushed a commit to branch master
in repository python-websockets.

commit 78e71fafbfbd41b0b0999b4a87e2e57d942e9dc1
Merge: 9b67fc9 edf789e
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Fri Jun 30 14:48:53 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...e-right-encoding-while-opening-README.rst.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index b2bf7ee,0000000..0668c21
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
- 4af41ef37b2c30dd408c21d5d3853059267bbe85
- 4af41ef37b2c30dd408c21d5d3853059267bbe85
++edf789e281e6c22452092ef192cf142992c5c557
++edf789e281e6c22452092ef192cf142992c5c557
 +4af41ef37b2c30dd408c21d5d3853059267bbe85
 +4af41ef37b2c30dd408c21d5d3853059267bbe85
 +python-websockets_3.3.orig.tar.gz
 +ab9a51b180e8ff557f49befb673bb5f21778b532
 +33852
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-use-the-right-encoding-while-opening-README.rst.patch
index 0000000,0000000..17b2f18
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-use-the-right-encoding-while-opening-README.rst.patch
@@@ -1,0 -1,0 +1,22 @@@
++From edf789e281e6c22452092ef192cf142992c5c557 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <piotr at debian.org>
++Date: Fri, 30 Jun 2017 14:48:02 +0200
++Subject: use the right encoding while opening README.rst
++
++---
++ setup.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 57ced17..e05acd5 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -7,7 +7,7 @@ root_dir = os.path.abspath(os.path.dirname(__file__))
++ 
++ description = "An implementation of the WebSocket Protocol (RFC 6455)"
++ 
++-with open(os.path.join(root_dir, 'README.rst')) as f:
+++with open(os.path.join(root_dir, 'README.rst'), encoding='utf-8') as f:
++     long_description = f.read()
++ 
++ with open(os.path.join(root_dir, 'websockets', 'version.py')) as f:
diff --cc debian/patches/series
index 0000000,0000000..d7c5f23
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-use-the-right-encoding-while-opening-README.rst.patch

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