diff --git a/debian/changelog b/debian/changelog index 848dc87..8c399d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-click (6.4-1) unstable; urgency=medium + + * New upstream release + * upstream fixed debian patch fix-locale-check.patch + + -- Adrian Alves Fri, 25 Mar 2016 09:33:30 -0500 + python-click (6.2-2) unstable; urgency=medium * Fixed locale detection error (Closes: #812713) diff --git a/debian/patches/fix-locale-check.patch b/debian/patches/fix-locale-check.patch deleted file mode 100644 index b6dda95..0000000 --- a/debian/patches/fix-locale-check.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: fixed locale detection error -Origin: vendor -Bug: 812713 -Author: Alexandre Viau -Reviewed-by: Alexandre Viau -Last-Update: 2016-01-26 -Applied-Upstream: https://github.com/mitsuhiko/click/commit/6bc3bf977a16d948841de17a6993ee11587b75b1 - ---- a/click/_unicodefun.py -+++ b/click/_unicodefun.py -@@ -64,6 +64,11 @@ - stderr=subprocess.PIPE).communicate()[0] - good_locales = set() - has_c_utf8 = False -+ -+ # Make sure we're operating on text here. -+ if isinstance(rv, bytes): -+ rv = rv.decode('ascii', 'replace') -+ - for line in rv.splitlines(): - locale = line.strip() - if locale.lower().endswith(('.utf-8', '.utf8')): diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 2f5f815..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix-locale-check.patch