[Python-modules-commits] [python-bcrypt] 09/15: merge patched into master

[Daniel Stender]

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

stender pushed a commit to branch master
in repository python-bcrypt.

commit a09466bcd5145fe1f811c89f8391cdf7d65b1cd3
Merge: a938d5e bfd87d6
Author: Daniel Stender <stender at debian.org>
Date:   Tue Jun 28 19:29:35 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0002-fix-README-ascii-decoding-error.patch     | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 1ff22d9,0000000..a8c96b1
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
- 2d23c2153fa377d32c903a3167f1ae7f528634f1
- 2d23c2153fa377d32c903a3167f1ae7f528634f1
++bfd87d69d993aabd320ee8d445aa92641ca625bc
++bfd87d69d993aabd320ee8d445aa92641ca625bc
 +0f2834d39ceca322763c9618acdbcc813b774b0c
 +0f2834d39ceca322763c9618acdbcc813b774b0c
 +python-bcrypt_3.0.0.orig.tar.xz
 +64f6f4433f41881cbc177ccf9187378dd3d02665
 +27420
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-fix-README-ascii-decoding-error.patch
index 0000000,0000000..1bf7a74
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-fix-README-ascii-decoding-error.patch
@@@ -1,0 -1,0 +1,26 @@@
++From bfd87d69d993aabd320ee8d445aa92641ca625bc Mon Sep 17 00:00:00 2001
++From: Daniel Stender <stender at debian.org>
++Date: Tue, 28 Jun 2016 19:21:19 +0200
++Subject: fix README ascii decoding error
++
++Easy fix for encoding error when build in non-utf8 enviroments.
++`encoding` isn't available as argument for open() in Python 2.7, so
++that can't be fixed with that keeping the long description text.
++Forwarded: not-needed
++---
++ setup.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 060e675..f9253c7 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -192,7 +192,7 @@ setup(
++     version=__about__["__version__"],
++ 
++     description=__about__["__summary__"],
++-    long_description=open("README.rst").read(),
+++    long_description='not available',
++     url=__about__["__uri__"],
++     license=__about__["__license__"],
++ 
diff --cc debian/patches/series
index 2487fad,0000000..0355098
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-import-tests-from-github.patch
++0002-fix-README-ascii-decoding-error.patch

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