[med-svn] [python-cutadapt] 04/06: Refresh patches, add patch to fix setup.py encoding issue

[Kevin Murray]

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

daube-guest pushed a commit to branch master
in repository python-cutadapt.

commit db0912d4272f17ff0e0f9cb73e7e3e04ff2fd3bd
Author: Kevin Murray <kdmfoss at gmail.com>
Date:   Fri Dec 2 14:03:18 2016 +1100

    Refresh patches, add patch to fix setup.py encoding issue
---
 .../0002-Fix-encoding-issue-in-setup.py.patch      | 23 ++++++++++++++++++++++
 debian/patches/cython_version.patch                | 15 +++++++++-----
 debian/patches/series                              |  1 +
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/debian/patches/0002-Fix-encoding-issue-in-setup.py.patch b/debian/patches/0002-Fix-encoding-issue-in-setup.py.patch
new file mode 100644
index 0000000..2c7de72
--- /dev/null
+++ b/debian/patches/0002-Fix-encoding-issue-in-setup.py.patch
@@ -0,0 +1,23 @@
+From: Kevin Murray <kdmfoss at gmail.com>
+Date: Fri, 2 Dec 2016 13:59:59 +1100
+Subject: Fix encoding issue in setup.py
+
+---
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 0a6be71..ac2d66c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -116,8 +116,8 @@ class sdist(versioneer_sdist):
+ cmdclass['build_ext'] = build_ext
+ cmdclass['sdist'] = sdist
+ 
+-with open('README.rst') as f:
+-	long_description = f.read()
++with open('README.rst', 'rb') as f:
++	long_description = f.read().decode('utf8')
+ 
+ setup(
+ 	name = 'cutadapt',
diff --git a/debian/patches/cython_version.patch b/debian/patches/cython_version.patch
index c68dec1..01091f4 100644
--- a/debian/patches/cython_version.patch
+++ b/debian/patches/cython_version.patch
@@ -1,11 +1,16 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Mon, 20 Jun 2016 14:38:23 +0200
-Description: Lets hope that the available cython (even in Jessie backports)
- version is sufficient ...
+From: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Date: Fri, 2 Dec 2016 13:59:08 +1100
+Subject: cython_version
 
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index dbb2001..0a6be71 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,7 @@ from distutils.command.sdist import sdist as _sdist
  from distutils.command.build_ext import build_ext as _build_ext
  import versioneer
  
diff --git a/debian/patches/series b/debian/patches/series
index 80f9065..c3dfe4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 cython_version.patch
+0002-Fix-encoding-issue-in-setup.py.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-cutadapt.git