[Python-modules-commits] [python-bcrypt] 08/09: fix 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 0f451cea585992cea2c13f462ef5196dea7cc7a7
Merge: ccad79a ae550c4
Author: Daniel Stender <stender at debian.org>
Date:   Sat Dec 3 10:32:15 2016 +0100

    fix a patch

 debian/.git-dpm                                        |  4 ++--
 .../patches/0001-fix-README-ascii-decoding-error.patch | 18 +++++++++++++-----
 setup.py                                               |  1 +
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index 601e95a,0000000..889cb9d
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
- e614e4069ec46a50296895ae53619521ff8ec4dd
- e614e4069ec46a50296895ae53619521ff8ec4dd
++ae550c486b72e73e8a632265c8cb4d7018760d8a
++ae550c486b72e73e8a632265c8cb4d7018760d8a
 +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 d17b312,0000000..835a38e
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,24 -1,0 +1,32 @@@
- From e614e4069ec46a50296895ae53619521ff8ec4dd Mon Sep 17 00:00:00 2001
++From ae550c486b72e73e8a632265c8cb4d7018760d8a 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.
 +Forwarded: not-needed
 +---
-  setup.py | 2 +-
-  1 file changed, 1 insertion(+), 1 deletion(-)
++ setup.py | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
 +
 +diff --git a/setup.py b/setup.py
- index 060e675..27fbc8b 100644
++index 060e675..f67b1f6 100644
 +--- a/setup.py
 ++++ b/setup.py
- @@ -192,7 +192,7 @@ setup(
++@@ -1,6 +1,7 @@
++ #!/usr/bin/env python
++ import platform
++ import sys
+++import io
++ from distutils.command.build import build
++ 
++ from setuptools import setup
++@@ -192,7 +193,7 @@ setup(
 +     version=__about__["__version__"],
 + 
 +     description=__about__["__summary__"],
 +-    long_description=open("README.rst").read(),
 ++    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