[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#861843: marked as done (unblock: (pre-approval) hplip/3.16.11+repack0-3)

Your message dated Mon, 08 May 2017 16:43:33 +0000
with message-id <E1d7lkz-0005HI-DM@respighi.debian.org>
and subject line unblock hplip
has caused the Debian Bug report #861843,
regarding unblock: (pre-approval) hplip/3.16.11+repack0-3
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
861843: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=861843
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

I plan to upload hplip with a simple fix for #861731 (UnicodeDecodeError on
some filenames) that has apparently been committed upstream.

This is the changelog entry:
>   [ Gaurav Sood ]
>   * Fix handling of unicode filenames in sixext.py
>     (Closes: #861731, LP: #1480152)

Please see the attached debdiff

diff -Nru hplip-3.16.11+repack0/debian/changelog hplip-3.16.11+repack0/debian/changelog
--- hplip-3.16.11+repack0/debian/changelog	2017-01-30 21:36:12.000000000 +0100
+++ hplip-3.16.11+repack0/debian/changelog	2017-05-04 18:35:44.000000000 +0200
@@ -1,3 +1,11 @@
+hplip (3.16.11+repack0-3) unstable; urgency=low
+
+  [ Gaurav Sood ]
+  * Fix handling of unicode filenames in sixext.py
+    (Closes: #861731, LP: #1480152)
+
+ -- Didier Raboud <odyx@debian.org>  Thu, 04 May 2017 18:35:44 +0200
+
 hplip (3.16.11+repack0-2) unstable; urgency=medium
 
   [ Brian Potkin ]
diff -Nru hplip-3.16.11+repack0/debian/gbp.conf hplip-3.16.11+repack0/debian/gbp.conf
--- hplip-3.16.11+repack0/debian/gbp.conf	2017-01-30 19:42:12.000000000 +0100
+++ hplip-3.16.11+repack0/debian/gbp.conf	2017-05-04 18:34:48.000000000 +0200
@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = debian/master
+debian-branch = debian/stretch
 upstream-branch = upstream/latest
 pristine-tar = True
 
diff -Nru hplip-3.16.11+repack0/debian/.git-dpm hplip-3.16.11+repack0/debian/.git-dpm
--- hplip-3.16.11+repack0/debian/.git-dpm	2017-01-30 19:42:12.000000000 +0100
+++ hplip-3.16.11+repack0/debian/.git-dpm	2017-05-04 18:34:48.000000000 +0200
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-23ef661a83d0a96ba61be2eef3ac502a2c000724
-23ef661a83d0a96ba61be2eef3ac502a2c000724
+602e2d8fb42cf4b62bf245702f314fecf6a2227c
+602e2d8fb42cf4b62bf245702f314fecf6a2227c
 eafc834119e19d43010499f9205cd5f4485973f4
 eafc834119e19d43010499f9205cd5f4485973f4
 hplip_3.16.11+repack0.orig.tar.xz
diff -Nru hplip-3.16.11+repack0/debian/patches/0024-Fix-handling-of-unicode-filenames-in-sixext.py.patch hplip-3.16.11+repack0/debian/patches/0024-Fix-handling-of-unicode-filenames-in-sixext.py.patch
--- hplip-3.16.11+repack0/debian/patches/0024-Fix-handling-of-unicode-filenames-in-sixext.py.patch	1970-01-01 01:00:00.000000000 +0100
+++ hplip-3.16.11+repack0/debian/patches/0024-Fix-handling-of-unicode-filenames-in-sixext.py.patch	2017-05-04 18:34:48.000000000 +0200
@@ -0,0 +1,29 @@
+From 602e2d8fb42cf4b62bf245702f314fecf6a2227c Mon Sep 17 00:00:00 2001
+From: Gaurav Sood <gaurav-sood@invalid-email.launchpad.net>
+Date: Thu, 4 May 2017 18:32:08 +0200
+Subject: Fix handling of unicode filenames in sixext.py
+
+LP: #1480152
+Closes: #861731
+---
+ base/sixext.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/base/sixext.py b/base/sixext.py
+index 0bf4fc4f4..311bf72c6 100644
+--- a/base/sixext.py
++++ b/base/sixext.py
+@@ -110,11 +110,11 @@ if PY3:
+ 
+ 
+     def to_string_utf8(s):
+-        return s.decode("utf-8")
++        return s.decode("utf-8", 'ignore')
+ 
+ 
+     def to_string_latin(s):
+-        return s.decode("latin-1")
++        return s.decode("latin-1", 'ignore')
+ 
+ 
+     def to_unicode(s, enc=None):
diff -Nru hplip-3.16.11+repack0/debian/patches/series hplip-3.16.11+repack0/debian/patches/series
--- hplip-3.16.11+repack0/debian/patches/series	2017-01-30 19:42:12.000000000 +0100
+++ hplip-3.16.11+repack0/debian/patches/series	2017-05-04 18:34:48.000000000 +0200
@@ -21,3 +21,4 @@
 0021-Fix-erroneous-tabs-in-hpps-python-code.patch
 0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
 0023-Fix-list-wrapping-in-scan.py-to-fix-generated-manpag.patch
+0024-Fix-handling-of-unicode-filenames-in-sixext.py.patch

--- End Message ---
--- Begin Message --- 
Unblocked hplip.

--- End Message ---
Reply to: