r49074 - in /desktop/unstable/caribou/debian: changelog patches/ patches/01_fix_print_python3.patch patches/02_fix_pygi_warnings.patch patches/series

[bigon at users.alioth.debian.org]

Author: bigon
Date: Tue Jun 14 20:15:09 2016
New Revision: 49074

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49074
Log:
* debian/patches/01_fix_print_python3.patch: Fix print statement in python3
* debian/patches/02_fix_pygi_warnings.patch: Set version of the bindings

Added:
    desktop/unstable/caribou/debian/patches/
    desktop/unstable/caribou/debian/patches/01_fix_print_python3.patch
    desktop/unstable/caribou/debian/patches/02_fix_pygi_warnings.patch
    desktop/unstable/caribou/debian/patches/series
Modified:
    desktop/unstable/caribou/debian/changelog

Modified: desktop/unstable/caribou/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/changelog?rev=49074&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/changelog	[utf-8] (original)
+++ desktop/unstable/caribou/debian/changelog	[utf-8] Tue Jun 14 20:15:09 2016
@@ -3,8 +3,10 @@
   * Switch to python3
   * Drop -dbg packages and rely on the automatically -dbgsym built ones
   * debian/control.in: Bump Standards-Version to 3.9.8 (no further changes)
+  * debian/patches/01_fix_print_python3.patch: Fix print statement in python3
+  * debian/patches/02_fix_pygi_warnings.patch: Set version of the bindings
 
- -- Laurent Bigonville <bigon at debian.org>  Tue, 14 Jun 2016 20:02:21 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 14 Jun 2016 22:13:20 +0200
 
 caribou (0.4.20-1) unstable; urgency=medium
 

Added: desktop/unstable/caribou/debian/patches/01_fix_print_python3.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/patches/01_fix_print_python3.patch?rev=49074&op=file
==============================================================================
--- desktop/unstable/caribou/debian/patches/01_fix_print_python3.patch	(added)
+++ desktop/unstable/caribou/debian/patches/01_fix_print_python3.patch	[utf-8] Tue Jun 14 20:15:09 2016
@@ -0,0 +1,40 @@
+From 26df33633315fd3bd1f413ffddfd5ef68ac07c50 Mon Sep 17 00:00:00 2001
+From: Parag Nemade <pnemade at redhat.com>
+Date: Fri, 8 Apr 2016 11:16:33 +0530
+Subject: fix print statement syntax for python3
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764764
+---
+ bin/antler-keyboard.in     | 2 +-
+ bin/caribou-preferences.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bin/antler-keyboard.in b/bin/antler-keyboard.in
+index a1f41a6..03405a4 100755
+--- a/bin/antler-keyboard.in
++++ b/bin/antler-keyboard.in
+@@ -26,7 +26,7 @@ datarootdir=@datarootdir@
+ 
+ if [ $script_dir = "@libexecdir@" ]
+ then
+-  datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")"
++  datadir="$(@PYTHON@ -c "from gi.repository import GLib; print(':'.join(GLib.get_system_data_dirs()))")"
+   export PYTHONPATH="${prefix}/lib/python at PYTHON_VERSION@/site-packages:${prefix}/lib64/python at PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}"
+   export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
+   export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+diff --git a/bin/caribou-preferences.in b/bin/caribou-preferences.in
+index eaacf05..3409bb9 100755
+--- a/bin/caribou-preferences.in
++++ b/bin/caribou-preferences.in
+@@ -26,7 +26,7 @@ datarootdir=@datarootdir@
+ 
+ if [ $script_dir = "@bindir@" ]
+ then
+-  datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")"
++  datadir="$(@PYTHON@ -c "from gi.repository import GLib; print(':'.join(GLib.get_system_data_dirs()))")"
+   export PYTHONPATH="@prefix@/lib/python at PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}"
+   export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
+   export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+-- 
+cgit v0.12
+

Added: desktop/unstable/caribou/debian/patches/02_fix_pygi_warnings.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/patches/02_fix_pygi_warnings.patch?rev=49074&op=file
==============================================================================
--- desktop/unstable/caribou/debian/patches/02_fix_pygi_warnings.patch	(added)
+++ desktop/unstable/caribou/debian/patches/02_fix_pygi_warnings.patch	[utf-8] Tue Jun 14 20:15:09 2016
@@ -0,0 +1,27 @@
+From d5d0dc7be9663643f5e1ae7fec7241325cf7cb43 Mon Sep 17 00:00:00 2001
+From: Parag Nemade <pnemade at redhat.com>
+Date: Fri, 8 Apr 2016 11:14:33 +0530
+Subject: Fix PyGIWarning warnings in preferences_window.py
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764764
+---
+ caribou/settings/preferences_window.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/caribou/settings/preferences_window.py b/caribou/settings/preferences_window.py
+index 541ecb5..350ab59 100644
+--- a/caribou/settings/preferences_window.py
++++ b/caribou/settings/preferences_window.py
+@@ -21,6 +21,9 @@
+ from caribou.settings.setting_types import *
+ 
++import gi
+ from gi.repository import GObject
++gi.require_version('Gtk', '3.0')
++gi.require_version('Gdk', '3.0')
+ from gi.repository import Gdk
+ from gi.repository import Gtk
+ 
+-- 
+cgit v0.12
+

Added: desktop/unstable/caribou/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/patches/series?rev=49074&op=file
==============================================================================
--- desktop/unstable/caribou/debian/patches/series	(added)
+++ desktop/unstable/caribou/debian/patches/series	[utf-8] Tue Jun 14 20:15:09 2016
@@ -0,0 +1,2 @@
+01_fix_print_python3.patch
+02_fix_pygi_warnings.patch