[Python-modules-commits] [python-bcrypt] 06/09: rewritten a patch

[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 ccad79ad740c5196dcf65f15c68bd57e57cd5c69
Merge: c1a5a5f e614e40
Author: Daniel Stender <stender at debian.org>
Date:   Sat Dec 3 10:28:22 2016 +0100

    rewritten a patch

 debian/.git-dpm                                           | 4 ++--
 debian/patches/0001-fix-README-ascii-decoding-error.patch | 8 +++-----
 setup.py                                                  | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 181db6b,0000000..601e95a
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
- 6511a1c40f6091c2d20240a0c121bb5994e85a5a
- 6511a1c40f6091c2d20240a0c121bb5994e85a5a
++e614e4069ec46a50296895ae53619521ff8ec4dd
++e614e4069ec46a50296895ae53619521ff8ec4dd
 +df9dc2c7cf7a3d129596bad89e4301a9d0b83de9
 +df9dc2c7cf7a3d129596bad89e4301a9d0b83de9
 +python-bcrypt_3.1.1.orig.tar.xz
 +afe9228c63207954b5b96dbfca6a90d06d7b9b8f
 +32648
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-fix-README-ascii-decoding-error.patch
index acc7f78,0000000..d17b312
mode 100644,000000..100644
--- a/debian/patches/0001-fix-README-ascii-decoding-error.patch
+++ b/debian/patches/0001-fix-README-ascii-decoding-error.patch
@@@ -1,26 -1,0 +1,24 @@@
- From 6511a1c40f6091c2d20240a0c121bb5994e85a5a Mon Sep 17 00:00:00 2001
++From e614e4069ec46a50296895ae53619521ff8ec4dd 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 environments.
- `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
++index 060e675..27fbc8b 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',
+++    long_description=io.open("README.rst", encoding='utf-8').read(),
 +     url=__about__["__uri__"],
 +     license=__about__["__license__"],
 + 

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