[Python-modules-commits] [python-bcrypt] 12/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 0a1e8046c6f8a6fbd7c9f61b5111e5c5a9809228
Merge: bcbfaba 6684eb3
Author: Daniel Stender <stender at debian.org>
Date:   Tue Jun 28 19:31:45 2016 +0200

    merge patched into master

 debian/.git-dpm                                           | 4 ++--
 debian/patches/0002-fix-README-ascii-decoding-error.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index a8c96b1,0000000..9c481b1
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
- bfd87d69d993aabd320ee8d445aa92641ca625bc
- bfd87d69d993aabd320ee8d445aa92641ca625bc
++6684eb3bcaa678b1a3edfad2660b84fa199277fa
++6684eb3bcaa678b1a3edfad2660b84fa199277fa
 +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 1bf7a74,0000000..b1ee63c
mode 100644,000000..100644
--- a/debian/patches/0002-fix-README-ascii-decoding-error.patch
+++ b/debian/patches/0002-fix-README-ascii-decoding-error.patch
@@@ -1,26 -1,0 +1,26 @@@
- From bfd87d69d993aabd320ee8d445aa92641ca625bc Mon Sep 17 00:00:00 2001
++From 6684eb3bcaa678b1a3edfad2660b84fa199277fa 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.
++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
 +--- 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__"],
 + 

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