[Python-modules-commits] [python-gammu] 04/04: Patch merged upstream.

[Michal Cihar]

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

nijel pushed a commit to annotated tag debian/2.4-1
in repository python-gammu.

commit b85d0043e2934946c8b0821f8e91847d83e9fa20
Author: Michal Čihař <michal at cihar.com>
Date:   Wed Sep 2 10:25:21 2015 +0200

    Patch merged upstream.
---
 debian/changelog                                   |  1 +
 .../0001-Explicitely-define-README-encoding.patch  | 35 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dff2c94..631be7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ python-gammu (2.4-1) unstable; urgency=medium
 
   * New upstream release.
     - Fixes FTBFS on s390x and ppc64.
+    - Patch merged upstream.
 
  -- Michal Čihař <nijel at debian.org>  Wed, 02 Sep 2015 10:24:23 +0200
 
diff --git a/debian/patches/0001-Explicitely-define-README-encoding.patch b/debian/patches/0001-Explicitely-define-README-encoding.patch
deleted file mode 100644
index 9a82908..0000000
--- a/debian/patches/0001-Explicitely-define-README-encoding.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 484af70ed4402b3ba6ff147d9d4b7ac676605879 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal at cihar.com>
-Date: Wed, 3 Jun 2015 15:02:15 +0200
-Subject: [PATCH 1/1] Explicitely define README encoding
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Michal Čihař <michal at cihar.com>
----
- setup.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index a02dcaf..836bb08 100755
---- a/setup.py
-+++ b/setup.py
-@@ -27,11 +27,13 @@ python-gammu - Phone communication libary
- import distutils.spawn
- from setuptools import setup, Extension
- import os
-+import codecs
- 
- # some defines
- VERSION = '2.3'
- GAMMU_REQUIRED = '1.34.0'
--with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme:
-+README_FILE = os.path.join(os.path.dirname(__file__), 'README.rst')
-+with codecs.open(README_FILE, 'r', 'utf-8') as readme:
-     README = readme.read()
- 
- 
--- 
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a0d662b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Explicitely-define-README-encoding.patch

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