merge patched into master

debian/.git-dpm

@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-b2587b721e905602c9c8a5827fcc4c4adb2610ea
+0951a7f3994334af3bc872813e7b9ccc13f7610f
-b2587b721e905602c9c8a5827fcc4c4adb2610ea
+0951a7f3994334af3bc872813e7b9ccc13f7610f
 2faeac3a1a1d69a046284fba9565c28af0d8595b
 2faeac3a1a1d69a046284fba9565c28af0d8595b
 kitchen_1.2.4.orig.tar.gz

debian/patches/explicit_Exception_catching

@@ -1,4 +1,4 @@
-From a4a696f4dafa6b13c3898d01acafcf958956eb1f Mon Sep 17 00:00:00 2001
+From 85b7e2bd2676a9a58bee2f088ee23f99b5666abe Mon Sep 17 00:00:00 2001
 From: Simon Chopin <chopin.simon@gmail.com>
 Date: Tue, 30 Apr 2013 18:27:15 +0200
 Subject: Make kitchen.text.converters.exception_to_* not swallow

debian/patches/fix_typos

@@ -1,4 +1,4 @@
-From d273a44568e6b1986ebae428b86c8b441cda03ed Mon Sep 17 00:00:00 2001
+From e99dd6fa948618015ec19ae1e7f4326e5bb63d21 Mon Sep 17 00:00:00 2001
 From: Simon Chopin <chopin.simon@gmail.com>
 Date: Tue, 30 Apr 2013 17:28:27 +0200
 Subject: Fix several typos
@@ -10,12 +10,12 @@ Patch-Name: fix_typos
  kitchen2/docs/api-pycompat27.rst                        | 2 +-
  kitchen2/docs/designing-unicode-apis.rst                | 2 +-
  kitchen2/docs/hacking.rst                               | 2 +-
- kitchen2/docs/unicode-frustrations.rst                  | 4 ++--
+ kitchen2/docs/unicode-frustrations.rst                  | 6 +++---
  kitchen2/kitchen/i18n/__init__.py                       | 6 +++---
  kitchen2/kitchen/pycompat25/collections/_defaultdict.py | 2 +-
  kitchen2/kitchen/text/display.py                        | 6 +++---
  releaseutils.py                                         | 2 +-
- 8 files changed, 13 insertions(+), 13 deletions(-)
+ 8 files changed, 14 insertions(+), 14 deletions(-)
 
 diff --git a/kitchen2/docs/api-pycompat27.rst b/kitchen2/docs/api-pycompat27.rst
 index 6ef6db1..9654b31 100644
@@ -55,7 +55,7 @@ index 530b7f2..5eb03c7 100644
  * Generally useful or needed for other pieces of kitchen.
  
 diff --git a/kitchen2/docs/unicode-frustrations.rst b/kitchen2/docs/unicode-frustrations.rst
-index c46e797..1588107 100644
+index c46e797..5175104 100644
 --- a/kitchen2/docs/unicode-frustrations.rst
 +++ b/kitchen2/docs/unicode-frustrations.rst
 @@ -33,7 +33,7 @@ In python-2.x, there's two types that deal with text.
@@ -76,6 +76,15 @@ index c46e797..1588107 100644
  But what happens when you use :func:`print`?  The terminal is a file-like object
  so it should raise an exception right?  The answer to that is....
  *sometimes*:
+@@ -539,7 +539,7 @@ a short example that uses many kitchen functions to do its work::
+             # Note that we do not let implici type conversion from str to
+             # unicode transform b_filename into a unicode string.  That might
+             # fail as python would use the ASCII filename.  Instead we use
+-            # to_unicode() to explictly transform in a way that we know will
++            # to_unicode() to explicitly transform in a way that we know will
+             # not traceback.
+             print _(u'filename: %s') % to_unicode(b_filename)
+             print _(u'file size: %s') % size
 diff --git a/kitchen2/kitchen/i18n/__init__.py b/kitchen2/kitchen/i18n/__init__.py
 index 80fe3ea..b694409 100644
 --- a/kitchen2/kitchen/i18n/__init__.py

debian/patches/remove_compat_layers

@@ -1,4 +1,4 @@
-From 7e18b88f80c37654a8001a8fffff5a4107af5175 Mon Sep 17 00:00:00 2001
+From 727e0eb7f33edfca9f1d18997fb2766a2dd3c9fd Mon Sep 17 00:00:00 2001
 From: Simon Chopin <chopin.simon@gmail.com>
 Date: Thu, 8 Oct 2015 09:26:23 -0700
 Subject: Remove the pycompat* submodules

debian/patches/update-combined-table-display-py3.patch

@@ -1,4 +1,4 @@
-From b2587b721e905602c9c8a5827fcc4c4adb2610ea Mon Sep 17 00:00:00 2001
+From 0951a7f3994334af3bc872813e7b9ccc13f7610f Mon Sep 17 00:00:00 2001
 From: Sergio Durigan Junior <sergiodj@sergiodj.net>
 Date: Sat, 9 Jul 2016 19:05:10 -0400
 Subject: Update COMBINED table on kitchen3/kitchen/text/display.py

kitchen2/docs/unicode-frustrations.rst

@@ -539,7 +539,7 @@ a short example that uses many kitchen functions to do its work::
             # Note that we do not let implici type conversion from str to
             # unicode transform b_filename into a unicode string.  That might
             # fail as python would use the ASCII filename.  Instead we use
-            # to_unicode() to explictly transform in a way that we know will
+            # to_unicode() to explicitly transform in a way that we know will
             # not traceback.
             print _(u'filename: %s') % to_unicode(b_filename)
             print _(u'file size: %s') % size