[Python-modules-commits] [python-socketpool] 01/01: Update and add gustavo panizzo changes

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch master
in repository python-socketpool.

commit b6ada8b0e24c75028ec76350837243147b46ce1f
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Sep 27 14:33:11 2016 +0200

    Update and add gustavo panizzo changes
---
 debian/changelog               | 16 ++++++++++++++--
 debian/compat                  |  2 +-
 debian/control                 | 21 +++++++++++----------
 debian/patches/fix-FTBFS.patch | 20 ++++++++++++++++++++
 debian/patches/series          |  1 +
 setup.py                       |  4 ++--
 6 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8e866c..10af7c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,21 @@
-python-socketpool (0.5.3-3) UNRELEASED; urgency=medium
+python-socketpool (0.5.3-3) unstable; urgency=low
 
+  [ Gianfranco Costamagna ]
+  * Team upload
+
+  [ gustavo panizzo ]
+  * Patch setup.py to use codecs module to read unicode, Fixes FTBFS
+    (Closes: #835682) (Closes: #834920).
+  * Fix a typo on python3-socketpool long description
+  * Increase the delhelper compat level to 9.
+  * Add dh-python to build deps.
+  * Bump Standards-Version to 3.9.8. No changes were needed.
+
+  [ Ondřej Nový ]
   * Fixed homepage (https)
   * Fixed VCS URL (https)
 
- -- Ondřej Nový <novy at ondrej.org>  Tue, 29 Mar 2016 22:23:47 +0200
+ -- gustavo panizzo <gfa at zumbi.com.ar>  Tue, 20 Sep 2016 18:41:35 +0800
 
 python-socketpool (0.5.3-2) unstable; urgency=medium
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 30c44cd..1cc3365 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,22 @@
 Source: python-socketpool
 Section: python
 Priority: extra
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> 
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: TANIGUCHI Takaki <takaki at debian.org>
-Build-Depends: debhelper (>= 8.0.0),
-	python-all,
-	python3-all,
-	python-setuptools,
-	python3-setuptools
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               python-all,
+               python-setuptools,
+               python3-all,
+               python3-setuptools
+Standards-Version: 3.9.8
 Homepage: https://pypi.python.org/pypi/socketpool
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-socketpool.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-socketpool.git
 
 Package: python-socketpool
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}
 Provides: ${python:Provides}
 Description: simple Python 2 socket pool
  Socket pool is a simple socket pool that supports multiple factories and
@@ -25,10 +26,10 @@ Description: simple Python 2 socket pool
 
 Package: python3-socketpool
 Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}
 Provides: ${python3:Provides}
 Description: simple Python 3 socket pool
  Socket pool is a simple socket pool that supports multiple factories and
  backends. It can easily be used by gevent, eventlet or any other library.
  .
- This package for Python 2.
+ This package for Python 3.
diff --git a/debian/patches/fix-FTBFS.patch b/debian/patches/fix-FTBFS.patch
new file mode 100644
index 0000000..81a32b5
--- /dev/null
+++ b/debian/patches/fix-FTBFS.patch
@@ -0,0 +1,20 @@
+Description: Fix a FTBFS
+ setup.py open() an unicode file as ascii, this patch modifies setup.py
+ to open the file as binary then decodes it from utf-8
+Origin: Upstream
+Author: Ralph Bean rbean at redhat.com
+Last-Update: 2016-04-06
+
+--- 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 --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c41fab6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-FTBFS.patch
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",

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