r49183 - in /desktop/unstable/caribou/debian: changelog patches/03_fix_python3.patch patches/04_fix_antler-keyboard-traceback.patch patches/series

[bigon at users.alioth.debian.org]

Author: bigon
Date: Mon Jun 27 16:52:22 2016
New Revision: 49183

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49183
Log:
debian/patches/04_fix_antler-keyboard-traceback.patch: Fix class import

Added:
    desktop/unstable/caribou/debian/patches/04_fix_antler-keyboard-traceback.patch
Modified:
    desktop/unstable/caribou/debian/changelog
    desktop/unstable/caribou/debian/patches/03_fix_python3.patch
    desktop/unstable/caribou/debian/patches/series

Modified: desktop/unstable/caribou/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/changelog?rev=49183&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/changelog	[utf-8] (original)
+++ desktop/unstable/caribou/debian/changelog	[utf-8] Mon Jun 27 16:52:22 2016
@@ -8,8 +8,9 @@
   * debian/patches/02_fix_pygi_warnings.patch: Set version of the bindings
   * debian/patches/03_fix_python3.patch: Fix python3 compatibility
   * debian/control.in: Add explicit build-dependency against dh-python
+  * debian/patches/04_fix_antler-keyboard-traceback.patch: Fix class import
 
- -- Laurent Bigonville <bigon at debian.org>  Mon, 27 Jun 2016 13:29:26 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 27 Jun 2016 18:52:01 +0200
 
 caribou (0.4.20-1) unstable; urgency=medium
 

Modified: desktop/unstable/caribou/debian/patches/03_fix_python3.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/patches/03_fix_python3.patch?rev=49183&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/patches/03_fix_python3.patch	[utf-8] (original)
+++ desktop/unstable/caribou/debian/patches/03_fix_python3.patch	[utf-8] Mon Jun 27 16:52:22 2016
@@ -1,8 +1,9 @@
-From afcc97fcef4e06fbc6a11e4acc722f46047ad676 Mon Sep 17 00:00:00 2001
+From c2bb701afab3c41cedf212ab4107e09584a6dabf Mon Sep 17 00:00:00 2001
 From: Parag Nemade <pnemade at redhat.com>
 Date: Thu, 16 Jun 2016 11:30:28 +0530
-Subject: [PATCH] Add missing python3 compatibility
+Subject: Add missing python3 compatibility
 
+https://bugzilla.gnome.org/show_bug.cgi?id=767664
 ---
  caribou/antler/keyboard_view.py        | 4 ++--
  caribou/antler/main.py                 | 3 +++
@@ -121,5 +122,5 @@
              for key in sorted(v, key=lambda x: x):
                  row.append(key[1])
 -- 
-2.7.4
+cgit v0.12
 

Added: desktop/unstable/caribou/debian/patches/04_fix_antler-keyboard-traceback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/patches/04_fix_antler-keyboard-traceback.patch?rev=49183&op=file
==============================================================================
--- desktop/unstable/caribou/debian/patches/04_fix_antler-keyboard-traceback.patch	(added)
+++ desktop/unstable/caribou/debian/patches/04_fix_antler-keyboard-traceback.patch	[utf-8] Mon Jun 27 16:52:22 2016
@@ -0,0 +1,25 @@
+From 3c4180d3f6645081aec833610db88a92a465403b Mon Sep 17 00:00:00 2001
+From: Parag Nemade <pnemade at redhat.com>
+Date: Mon, 27 Jun 2016 20:19:02 +0530
+Subject: Fix the antler-keyboard execution traceback
+
+https://bugzilla.gnome.org/show_bug.cgi?id=768092
+---
+ caribou/antler/keyboard_view.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/caribou/antler/keyboard_view.py b/caribou/antler/keyboard_view.py
+index d90ccc9..1851b38 100644
+--- a/caribou/antler/keyboard_view.py
++++ b/caribou/antler/keyboard_view.py
+@@ -1,6 +1,6 @@
+ from caribou.settings.preferences_window import PreferencesDialog
+ from caribou.settings import CaribouSettings
+-from antler_settings import AntlerSettings
++from .antler_settings import AntlerSettings
+ from gi.repository import Gtk
+ from gi.repository import Gdk
+ from gi.repository import GObject
+-- 
+cgit v0.12
+

Modified: desktop/unstable/caribou/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/patches/series?rev=49183&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/caribou/debian/patches/series	[utf-8] Mon Jun 27 16:52:22 2016
@@ -1,3 +1,4 @@
 01_fix_print_python3.patch
 02_fix_pygi_warnings.patch
 03_fix_python3.patch
+04_fix_antler-keyboard-traceback.patch