diff -Nru libgrip-0.3.7+13.10.20130628/debian/changelog libgrip-0.3.7+14.04.20140303/debian/changelog --- libgrip-0.3.7+13.10.20130628/debian/changelog 2014-03-03 20:11:11.000000000 +0000 +++ libgrip-0.3.7+14.04.20140303/debian/changelog 2014-03-03 20:11:11.000000000 +0000 @@ -1,3 +1,15 @@ +libgrip (0.3.7+14.04.20140303-0ubuntu1) trusty; urgency=low + + [ Stephen M. Webb ] + * Replace use of deprecated GTK+-3.0 function in example code. (LP: + #1266597) + * fix some Lintian packaging complaints. + * p revent the Geis object from being used until it has been + successfully initialized (lp: #1276333). (LP: #1276333) + * debian/control: bump Standards-Version to 3.9.5 (no changes) + + -- Ubuntu daily release Mon, 03 Mar 2014 20:07:30 +0000 + libgrip (0.3.7+13.10.20130628-0ubuntu2) trusty; urgency=medium * Fix FTBFS due to deprecated warning in examples code. diff -Nru libgrip-0.3.7+13.10.20130628/debian/control libgrip-0.3.7+14.04.20140303/debian/control --- libgrip-0.3.7+13.10.20130628/debian/control 2014-03-03 20:11:11.000000000 +0000 +++ libgrip-0.3.7+14.04.20140303/debian/control 2014-03-03 20:11:11.000000000 +0000 @@ -19,7 +19,7 @@ libglib2.0-dev (>=2.28.6), libgtk-3-dev (>= 3.0.8-0ubuntu1), libgeis-dev, -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: https://launchpad.net/libgrip # If you aren't a member of ~oif-team but need to upload # packaging changes, just go ahead. ~oif-team will notice @@ -32,9 +32,11 @@ Pre-Depends: multiarch-support, Depends: ${misc:Depends}, ${shlibs:Depends}, -Description: provides multitouch gestures to GTK+ apps - . - Libgrip hooks gesture recognition into GTK+ applications. +Description: multitouch gestures for GTK+ apps + Libgrip is an extenion library that provides widget-level programmable gesture + recognition for GTK+ applications natively within the toolkit. Widgets + subscribe to particular gestures and provide programmed functionality on + receipt of corresponding gesture events. Package: libgrip-dev Section: libdevel @@ -46,15 +48,24 @@ pkg-config, ${misc:Depends}, ${shlibs:Depends}, -Description: provides multitouch gestures to GTK+ apps -- development files +Description: multitouch gestures for GTK+ apps -- development files + Libgrip is an extenion library that provides widget-level programmable gesture + recognition for GTK+ applications natively within the toolkit. Widgets + subscribe to particular gestures and provide programmed functionality on + receipt of corresponding gesture events. . - This package contains files that are needed to build applications. + This package contains development files that are needed to build applications + against libgrip. Package: gir1.2-grip Architecture: any Depends: ${gir:Depends}, ${misc:Depends}, Description: typelib file for libgrip + Libgrip is an extenion library that provides widget-level programmable gesture + recognition for GTK+ applications natively within the toolkit. Widgets + subscribe to particular gestures and provide programmed functionality on + receipt of corresponding gesture events. . This package can be used by other packages using the GIRepository format to generate dynamic bindings for libgrip @@ -66,6 +77,10 @@ Depends: ${misc:Depends}, ${python:Depends}, Description: python bindings for libgrip + Libgrip is an extenion library that provides widget-level programmable gesture + recognition for GTK+ applications natively within the toolkit. Widgets + subscribe to particular gestures and provide programmed functionality on + receipt of corresponding gesture events. . This package provides Python bindings so that you can use libgrip from a Python program. diff -Nru libgrip-0.3.7+13.10.20130628/debian/libbrip0.symbols libgrip-0.3.7+14.04.20140303/debian/libbrip0.symbols --- libgrip-0.3.7+13.10.20130628/debian/libbrip0.symbols 2014-03-03 20:11:11.000000000 +0000 +++ libgrip-0.3.7+14.04.20140303/debian/libbrip0.symbols 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -libgrip-0.1.so.0 libgrip-0.1-0 #MINVER# - GRIP_0.1@GRIP_0.1 0.1.4 - grip_gesture_event_copy@GRIP_0.1 0.1.1 - grip_gesture_event_free@GRIP_0.1 0.1.1 - grip_gesture_event_get_type@GRIP_0.1 0.1.1 - grip_gesture_event_new@GRIP_0.1 0.1.1 - grip_gesture_manager_get@GRIP_0.1 0.1.0 - grip_gesture_manager_get_type@GRIP_0.1 0.1.0 - grip_gesture_manager_register_window@GRIP_0.1 0.1.0 - grip_gesture_type_get_type@GRIP_0.1 0.1.0 - grip_time_type_get_type@GRIP_0.1 0.1.0 diff -Nru libgrip-0.3.7+13.10.20130628/debian/libgrip0.symbols libgrip-0.3.7+14.04.20140303/debian/libgrip0.symbols --- libgrip-0.3.7+13.10.20130628/debian/libgrip0.symbols 1970-01-01 00:00:00.000000000 +0000 +++ libgrip-0.3.7+14.04.20140303/debian/libgrip0.symbols 2014-03-03 20:11:11.000000000 +0000 @@ -0,0 +1,23 @@ +libgrip.so.0 libgrip0 #MINVER# + GRIP_0.1@GRIP_0.1 0.1.4 + GRIP_0.2@GRIP_0.2 0.3.7 + GRIP_0.2.2@GRIP_0.2.2 0.3.7 + GRIP_0.3@GRIP_0.3 0.3.7 + grip_gesture_event_copy@GRIP_0.1 0.1.1 + grip_gesture_event_free@GRIP_0.1 0.1.1 + grip_gesture_event_get_type@GRIP_0.1 0.1.1 + grip_gesture_event_new@GRIP_0.1 0.1.1 + grip_gesture_manager_get@GRIP_0.1 0.1.0 + grip_gesture_manager_get_type@GRIP_0.1 0.1.0 + grip_gesture_manager_register_window@GRIP_0.1 0.1.0 + grip_gesture_manager_unregister_window@GRIP_0.2 0.3.7 + grip_gesture_type_get_type@GRIP_0.1 0.1.0 + grip_get_device_type@GRIP_0.3 0.3.7 + grip_input_device_get_id@GRIP_0.2.2 0.3.7 + grip_input_device_get_name@GRIP_0.2.2 0.3.7 + grip_input_device_get_type@GRIP_0.2.2 0.3.7 + grip_input_device_get_x_extents@GRIP_0.2.2 0.3.7 + grip_input_device_get_y_extents@GRIP_0.2.2 0.3.7 + grip_input_device_is_direct@GRIP_0.2.2 0.3.7 + grip_input_device_is_independent@GRIP_0.2.2 0.3.7 + grip_time_type_get_type@GRIP_0.1 0.1.0 diff -Nru libgrip-0.3.7+13.10.20130628/debian/rules libgrip-0.3.7+14.04.20140303/debian/rules --- libgrip-0.3.7+13.10.20130628/debian/rules 2014-03-03 20:11:11.000000000 +0000 +++ libgrip-0.3.7+14.04.20140303/debian/rules 2014-03-03 20:11:11.000000000 +0000 @@ -1,9 +1,5 @@ #!/usr/bin/make -f -LDFLAGS += -Wl,-O1 -Wl,--as-needed - -export DPKG_GENSYMBOLS_CHECK_LEVEL = 4 - %: dh $@ --with python2,autoreconf @@ -11,8 +7,7 @@ NOCONFIGURE=1 dh_autoreconf ./autogen.sh override_dh_auto_configure: - dh_auto_configure -- \ - --enable-gtk-doc + dh_auto_configure -- --enable-gtk-doc --disable-silent-rules override_dh_install: dh_install --fail-missing -X.a -X.la -X.pyc -X.pyo diff -Nru libgrip-0.3.7+13.10.20130628/src/gripgesturemanager.c libgrip-0.3.7+14.04.20140303/src/gripgesturemanager.c --- libgrip-0.3.7+13.10.20130628/src/gripgesturemanager.c 2013-06-28 02:00:57.000000000 +0000 +++ libgrip-0.3.7+14.04.20140303/src/gripgesturemanager.c 2014-03-03 20:07:11.000000000 +0000 @@ -50,6 +50,7 @@ /* * GripGestureManagerPrivate: * @geis: the GEIS instance + * @is_initialized: GEIS async initialization has been successfully completed * @iochannel: connects the geis object with the main loop * @iochannel_id: the identifier for the iochannel * @devices: a collection of recognized input devices @@ -60,6 +61,7 @@ struct _GripGestureManagerPrivate { Geis geis; + gboolean is_initialized; GIOChannel *iochannel; int iochannel_id; GripDevices *devices; @@ -258,6 +260,7 @@ break; case GEIS_EVENT_INIT_COMPLETE: + priv->is_initialized = TRUE; break; case GEIS_EVENT_GESTURE_BEGIN: @@ -660,6 +663,7 @@ GripGestureManagerPrivate *priv = self->priv = GRIP_GESTURE_MANAGER_GET_PRIVATE (self); priv->devices = g_ptr_array_new (); + priv->is_initialized = FALSE; priv->geis = geis_new (GEIS_INIT_TRACK_DEVICES, GEIS_INIT_TRACK_GESTURE_CLASSES, NULL); g_return_if_fail (priv->geis); @@ -722,6 +726,8 @@ g_return_if_fail (GTK_IS_WINDOW (toplevel)); GripGestureManagerPrivate *priv = req->manager->priv; + if (!priv->is_initialized) + return; guint window_id = GDK_WINDOW_XID (gtk_widget_get_window(toplevel));