diff -Nru libgrip-0.3.7+14.04.20140303/bindings/python/Makefile.am libgrip-0.3.8+14.10.20140624/bindings/python/Makefile.am --- libgrip-0.3.7+14.04.20140303/bindings/python/Makefile.am 2014-03-03 20:07:11.000000000 +0000 +++ libgrip-0.3.8+14.10.20140624/bindings/python/Makefile.am 2014-06-24 13:27:57.000000000 +0000 @@ -1,8 +1,5 @@ -PLATFORM_VERSION = 2.0 +pygioverridesdir = $(PYGI_OVERRIDES_DIR) -pkgpyexecdir = $(pyexecdir)/gi - -pygioverridesdir = $(pkgpyexecdir)/overrides pygioverrides_PYTHON = \ Grip.py diff -Nru libgrip-0.3.7+14.04.20140303/configure.ac libgrip-0.3.8+14.10.20140624/configure.ac --- libgrip-0.3.7+14.04.20140303/configure.ac 2014-03-03 20:07:11.000000000 +0000 +++ libgrip-0.3.8+14.10.20140624/configure.ac 2014-06-24 13:28:12.000000000 +0000 @@ -3,7 +3,7 @@ # m4_define([grip_major_version], [0]) m4_define([grip_minor_version], [3]) -m4_define([grip_micro_version], [7]) +m4_define([grip_micro_version], [8]) m4_define([grip_api_version], [grip_major_version.grip_minor_version]) @@ -28,6 +28,21 @@ AM_MAINTAINER_MODE AM_PATH_PYTHON +AC_ARG_WITH([pygi_overrides_dir], + AC_HELP_STRING([--with-pygi-overrides-dir], [Path to pygobject overrides directory])) +AC_MSG_CHECKING(for pygobject overrides directory) +if test "x$with_pygi_overrides_dir" = "x" ; then + overrides_dir="`$PYTHON -c 'import gi; print(gi._overridesdir)' 2>/dev/null`" + # fallback if the previous failed + if test "x$overrides_dir" = "x" ; then + overrides_dir="${pyexecdir}/gi/overrides" + fi +else + overrides_dir="$with_pygi_overrides_dir" +fi +PYGI_OVERRIDES_DIR="$overrides_dir" +AC_SUBST(PYGI_OVERRIDES_DIR) +AC_MSG_RESULT($PYGI_OVERRIDES_DIR) GRIP_MAJOR_VERSION=grip_major_version GRIP_MINOR_VERSION=grip_minor_version diff -Nru libgrip-0.3.7+14.04.20140303/debian/changelog libgrip-0.3.8+14.10.20140624/debian/changelog --- libgrip-0.3.7+14.04.20140303/debian/changelog 2014-06-24 18:26:18.000000000 +0000 +++ libgrip-0.3.8+14.10.20140624/debian/changelog 2014-06-24 18:26:19.000000000 +0000 @@ -1,3 +1,19 @@ +libgrip (0.3.8+14.10.20140624-0ubuntu1) utopic; urgency=medium + + [ Stephen M. Webb ] + * removed multi-arch from GIR typelib path (lp: #1332603) + * improved Python 3 support (lp: #1332516) + - moved all Python support into the GObject Introspection (GIR) package to + better support all Python versions + - removed python-libgrip package + - added Python 3 and Python-GIR build deps + * new upstream release 0.3.8 + + [ Ubuntu daily release ] + * New rebuild forced + + -- Ubuntu daily release Tue, 24 Jun 2014 13:28:22 +0000 + libgrip (0.3.7+14.04.20140303-0ubuntu1) trusty; urgency=low [ Stephen M. Webb ] diff -Nru libgrip-0.3.7+14.04.20140303/debian/control libgrip-0.3.8+14.10.20140624/debian/control --- libgrip-0.3.7+14.04.20140303/debian/control 2014-06-24 18:26:18.000000000 +0000 +++ libgrip-0.3.8+14.10.20140624/debian/control 2014-06-24 18:26:19.000000000 +0000 @@ -5,33 +5,31 @@ Maintainer: Ubuntu Developers Build-Depends: debhelper (>= 9), dh-autoreconf, - gnome-common, - gtk-doc-tools, - python, - python-dev, gir1.2-freedesktop, gir1.2-gdkpixbuf-2.0, gir1.2-glib-2.0, gir1.2-gtk-3.0, gir1.2-pango-1.0, + gnome-common, gobject-introspection, + gtk-doc-tools, + libgeis-dev, libgirepository1.0-dev, libglib2.0-dev (>=2.28.6), libgtk-3-dev (>= 3.0.8-0ubuntu1), - libgeis-dev, + python, + python-gi, + python3, + python3-gi 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 -# and sync up the code again. Vcs-Bzr: https://code.launchpad.net/~oif-team/libgrip/trunk Vcs-Browser: https://bazaar.launchpad.net/~oif-team/libgrip/trunk/files Package: libgrip0 Architecture: any -Pre-Depends: multiarch-support, -Depends: ${misc:Depends}, - ${shlibs:Depends}, +Pre-Depends: multiarch-support +Depends: ${misc:Depends}, ${shlibs:Depends} 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 @@ -41,13 +39,13 @@ Package: libgrip-dev Section: libdevel Architecture: any -Depends: libglib2.0-dev (>=2.28.6), +Depends: libgeis-dev, + libglib2.0-dev (>=2.28.6), libgrip0 (= ${binary:Version}), libgtk-3-dev (>= 3.0.8), - libgeis-dev, pkg-config, ${misc:Depends}, - ${shlibs:Depends}, + ${shlibs:Depends} 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 @@ -59,8 +57,10 @@ Package: gir1.2-grip Architecture: any -Depends: ${gir:Depends}, - ${misc:Depends}, +Depends: ${gir:Depends}, ${misc:Depends} +Provides: python-grip +Conflicts: python-grip (<< 0.3.8~) +Replaces: python-grip (<< 0.3.8~) 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 @@ -68,19 +68,5 @@ receipt of corresponding gesture events. . This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libgrip + generate dynamic bindings for libgrip. -Package: python-grip -Section: python -XB-Python-Version: ${python:Versions} -Architecture: all -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+14.04.20140303/debian/gir1.2-grip.install libgrip-0.3.8+14.10.20140624/debian/gir1.2-grip.install --- libgrip-0.3.7+14.04.20140303/debian/gir1.2-grip.install 2014-06-24 18:26:18.000000000 +0000 +++ libgrip-0.3.8+14.10.20140624/debian/gir1.2-grip.install 2014-06-24 18:26:19.000000000 +0000 @@ -1 +1,2 @@ -debian/tmp/usr/lib/*/girepository-1.0 +usr/lib/*/girepository-1.0 usr/lib +usr/lib/python*/*-packages/gi/overrides/*.py diff -Nru libgrip-0.3.7+14.04.20140303/debian/python-grip.install libgrip-0.3.8+14.10.20140624/debian/python-grip.install --- libgrip-0.3.7+14.04.20140303/debian/python-grip.install 2014-06-24 18:26:18.000000000 +0000 +++ libgrip-0.3.8+14.10.20140624/debian/python-grip.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/python*/* diff -Nru libgrip-0.3.7+14.04.20140303/debian/rules libgrip-0.3.8+14.10.20140624/debian/rules --- libgrip-0.3.7+14.04.20140303/debian/rules 2014-06-24 18:26:18.000000000 +0000 +++ libgrip-0.3.8+14.10.20140624/debian/rules 2014-06-24 18:26:19.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ --with python2,autoreconf + dh $@ --with python2,python3,autoreconf override_dh_autoreconf: NOCONFIGURE=1 dh_autoreconf ./autogen.sh @@ -10,5 +10,10 @@ dh_auto_configure -- --enable-gtk-doc --disable-silent-rules override_dh_install: + PYTHON=python3 ./configure --prefix=/usr + dh_auto_install -- -C bindings/python install dh_install --fail-missing -X.a -X.la -X.pyc -X.pyo +override_dh_python3: + dh_python3 debian/gir1.2-grip/usr/lib/python3 + diff -Nru libgrip-0.3.7+14.04.20140303/INSTALL libgrip-0.3.8+14.10.20140624/INSTALL --- libgrip-0.3.7+14.04.20140303/INSTALL 2014-03-03 20:07:11.000000000 +0000 +++ libgrip-0.3.8+14.10.20140624/INSTALL 2014-06-24 13:27:57.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -12,8 +12,8 @@ Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented @@ -226,6 +226,11 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -304,9 +309,10 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -362,4 +368,3 @@ `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. -