[Python-modules-commits] [python-socketpool] 02/03: merge patched into master

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to annotated tag debian/0.5.3-3
in repository python-socketpool.

commit c792fec0257f0322149e9bfb1e27898960471b26
Merge: f108336 600ec7a
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Sep 28 12:19:07 2016 +0200

    merge patched into master

 debian/.git-dpm                                |  4 ++--
 debian/patches/0001-Fix-build-with-utf-8.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 setup.py                                       |  4 ++--
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 7e39a89,0000000..6a57fcd
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
- 3ec0b208967d9e6e3d0e3dd7e4f1e860f77aa73f
- 3ec0b208967d9e6e3d0e3dd7e4f1e860f77aa73f
++600ec7a21ecacccee9b1d952f4780ece96998ce6
++600ec7a21ecacccee9b1d952f4780ece96998ce6
 +3ec0b208967d9e6e3d0e3dd7e4f1e860f77aa73f
 +3ec0b208967d9e6e3d0e3dd7e4f1e860f77aa73f
 +python-socketpool_0.5.3.orig.tar.gz
 +3c9987e86626aa48ba7e7689b5e738f49d7f2594
 +9793
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-build-with-utf-8.patch
index 0000000,0000000..67bad03
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-build-with-utf-8.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 600ec7a21ecacccee9b1d952f4780ece96998ce6 Mon Sep 17 00:00:00 2001
++From: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
++Date: Wed, 28 Sep 2016 12:16:53 +0200
++Subject: Fix build with utf-8
++
++---
++ setup.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index b7c13f9..4848652 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -22,8 +22,8 @@ CLASSIFIERS = [
++ 
++ 
++ # read long description
++-with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as f:
++-    long_description = f.read()
+++with open(os.path.join(os.path.dirname(__file__), 'README.rst'), 'rb') as f:
+++    long_description = f.read().decode('utf-8')
++ 
++ DATA_FILES = [
++         ('socketpool', ["LICENSE", "MANIFEST.in", "NOTICE", "README.rst",
diff --cc debian/patches/series
index 0000000,0000000..606bb4b
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-build-with-utf-8.patch

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