Merge lp:~bregma/libgrip/add-python3-support into lp:libgrip

Proposed by Stephen M. Webb on 2014-06-20
Status: Merged
Merged at revision: 93
Proposed branch: lp:~bregma/libgrip/add-python3-support
Merge into: lp:libgrip
Diff against target: 250 lines (+64/-46)
8 files modified
INSTALL (+12/-7)
bindings/python/Makefile.am (+2/-5)
configure.ac (+15/-0)
debian/changelog (+10/-0)
debian/control (+17/-31)
debian/gir1.2-grip.install (+2/-1)
debian/python-grip.install (+0/-1)
debian/rules (+6/-1)
To merge this branch: bzr merge lp:~bregma/libgrip/add-python3-support
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2014-06-24
Open Input Framework Team 2014-06-20 Pending
Review via email: mp+223982@code.launchpad.net

Commit message

add Python 3 support through GObject introspection

Description of the change

Adds Python 3 support through GObject introspection.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
94. By Stephen M. Webb on 2014-06-23

debian/control: added conflicts/replaces clause to gir binary deb

95. By Stephen M. Webb on 2014-06-24

debian/changelog: increased detail and verbosity of the change description

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'INSTALL'
2--- INSTALL 2012-11-22 22:16:54 +0000
3+++ INSTALL 2014-06-24 12:58:10 +0000
4@@ -1,8 +1,8 @@
5 Installation Instructions
6 *************************
7
8-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
9-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
11+Inc.
12
13 Copying and distribution of this file, with or without modification,
14 are permitted in any medium without royalty provided the copyright
15@@ -12,8 +12,8 @@
16 Basic Installation
17 ==================
18
19- Briefly, the shell commands `./configure; make; make install' should
20-configure, build, and install this package. The following
21+ Briefly, the shell command `./configure && make && make install'
22+should configure, build, and install this package. The following
23 more-detailed instructions are generic; see the `README' file for
24 instructions specific to this package. Some packages provide this
25 `INSTALL' file but do not implement all of the features documented
26@@ -226,6 +226,11 @@
27
28 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
29
30+ HP-UX `make' updates targets which have the same time stamps as
31+their prerequisites, which makes it generally unusable when shipped
32+generated files such as `configure' are involved. Use GNU `make'
33+instead.
34+
35 On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
36 parse its `<wchar.h>' header file. The option `-nodtk' can be used as
37 a workaround. If GNU CC is not installed, it is therefore recommended
38@@ -304,9 +309,10 @@
39 overridden in the site shell script).
40
41 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
42-an Autoconf bug. Until the bug is fixed you can use this workaround:
43+an Autoconf limitation. Until the limitation is lifted, you can use
44+this workaround:
45
46- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
47+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
48
49 `configure' Invocation
50 ======================
51@@ -362,4 +368,3 @@
52
53 `configure' also accepts some other, not widely useful, options. Run
54 `configure --help' for more details.
55-
56
57=== modified file 'bindings/python/Makefile.am'
58--- bindings/python/Makefile.am 2011-01-24 18:50:54 +0000
59+++ bindings/python/Makefile.am 2014-06-24 12:58:10 +0000
60@@ -1,8 +1,5 @@
61-PLATFORM_VERSION = 2.0
62-
63-pkgpyexecdir = $(pyexecdir)/gi
64-
65-pygioverridesdir = $(pkgpyexecdir)/overrides
66+pygioverridesdir = $(PYGI_OVERRIDES_DIR)
67+
68 pygioverrides_PYTHON = \
69 Grip.py
70
71
72=== modified file 'configure.ac'
73--- configure.ac 2013-06-27 13:00:08 +0000
74+++ configure.ac 2014-06-24 12:58:10 +0000
75@@ -28,6 +28,21 @@
76 AM_MAINTAINER_MODE
77
78 AM_PATH_PYTHON
79+AC_ARG_WITH([pygi_overrides_dir],
80+ AC_HELP_STRING([--with-pygi-overrides-dir], [Path to pygobject overrides directory]))
81+AC_MSG_CHECKING(for pygobject overrides directory)
82+if test "x$with_pygi_overrides_dir" = "x" ; then
83+ overrides_dir="`$PYTHON -c 'import gi; print(gi._overridesdir)' 2>/dev/null`"
84+ # fallback if the previous failed
85+ if test "x$overrides_dir" = "x" ; then
86+ overrides_dir="${pyexecdir}/gi/overrides"
87+ fi
88+else
89+ overrides_dir="$with_pygi_overrides_dir"
90+fi
91+PYGI_OVERRIDES_DIR="$overrides_dir"
92+AC_SUBST(PYGI_OVERRIDES_DIR)
93+AC_MSG_RESULT($PYGI_OVERRIDES_DIR)
94
95 GRIP_MAJOR_VERSION=grip_major_version
96 GRIP_MINOR_VERSION=grip_minor_version
97
98=== modified file 'debian/changelog'
99--- debian/changelog 2014-03-03 20:07:30 +0000
100+++ debian/changelog 2014-06-24 12:58:10 +0000
101@@ -1,3 +1,13 @@
102+libgrip (0.3.7+14.04.20140303-0ubuntu2) UNRELEASED; urgency=medium
103+
104+ * improved Python 3 support (lp: #1332516)
105+ - moved all Python support into the GObject Introspection (GIR) package to
106+ better support all Python versions
107+ - removed python-libgrip package
108+ - added Python 3 and Python-GIR build deps
109+
110+ -- Stephen M. Webb <stephen.webb@bregmasoft.ca> Fri, 20 Jun 2014 10:41:19 -0400
111+
112 libgrip (0.3.7+14.04.20140303-0ubuntu1) trusty; urgency=low
113
114 [ Stephen M. Webb ]
115
116=== modified file 'debian/control'
117--- debian/control 2014-03-03 14:58:42 +0000
118+++ debian/control 2014-06-24 12:58:10 +0000
119@@ -5,33 +5,31 @@
120 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
121 Build-Depends: debhelper (>= 9),
122 dh-autoreconf,
123- gnome-common,
124- gtk-doc-tools,
125- python,
126- python-dev,
127 gir1.2-freedesktop,
128 gir1.2-gdkpixbuf-2.0,
129 gir1.2-glib-2.0,
130 gir1.2-gtk-3.0,
131 gir1.2-pango-1.0,
132+ gnome-common,
133 gobject-introspection,
134+ gtk-doc-tools,
135+ libgeis-dev,
136 libgirepository1.0-dev,
137 libglib2.0-dev (>=2.28.6),
138 libgtk-3-dev (>= 3.0.8-0ubuntu1),
139- libgeis-dev,
140+ python,
141+ python-gi,
142+ python3,
143+ python3-gi
144 Standards-Version: 3.9.5
145 Homepage: https://launchpad.net/libgrip
146-# If you aren't a member of ~oif-team but need to upload
147-# packaging changes, just go ahead. ~oif-team will notice
148-# and sync up the code again.
149 Vcs-Bzr: https://code.launchpad.net/~oif-team/libgrip/trunk
150 Vcs-Browser: https://bazaar.launchpad.net/~oif-team/libgrip/trunk/files
151
152 Package: libgrip0
153 Architecture: any
154-Pre-Depends: multiarch-support,
155-Depends: ${misc:Depends},
156- ${shlibs:Depends},
157+Pre-Depends: multiarch-support
158+Depends: ${misc:Depends}, ${shlibs:Depends}
159 Description: multitouch gestures for GTK+ apps
160 Libgrip is an extenion library that provides widget-level programmable gesture
161 recognition for GTK+ applications natively within the toolkit. Widgets
162@@ -41,13 +39,13 @@
163 Package: libgrip-dev
164 Section: libdevel
165 Architecture: any
166-Depends: libglib2.0-dev (>=2.28.6),
167+Depends: libgeis-dev,
168+ libglib2.0-dev (>=2.28.6),
169 libgrip0 (= ${binary:Version}),
170 libgtk-3-dev (>= 3.0.8),
171- libgeis-dev,
172 pkg-config,
173 ${misc:Depends},
174- ${shlibs:Depends},
175+ ${shlibs:Depends}
176 Description: multitouch gestures for GTK+ apps -- development files
177 Libgrip is an extenion library that provides widget-level programmable gesture
178 recognition for GTK+ applications natively within the toolkit. Widgets
179@@ -59,8 +57,10 @@
180
181 Package: gir1.2-grip
182 Architecture: any
183-Depends: ${gir:Depends},
184- ${misc:Depends},
185+Depends: ${gir:Depends}, ${misc:Depends}
186+Provides: python-grip
187+Conflicts: python-grip (<< 0.3.8~)
188+Replaces: python-grip (<< 0.3.8~)
189 Description: typelib file for libgrip
190 Libgrip is an extenion library that provides widget-level programmable gesture
191 recognition for GTK+ applications natively within the toolkit. Widgets
192@@ -68,19 +68,5 @@
193 receipt of corresponding gesture events.
194 .
195 This package can be used by other packages using the GIRepository format to
196- generate dynamic bindings for libgrip
197+ generate dynamic bindings for libgrip.
198
199-Package: python-grip
200-Section: python
201-XB-Python-Version: ${python:Versions}
202-Architecture: all
203-Depends: ${misc:Depends},
204- ${python:Depends},
205-Description: python bindings for libgrip
206- Libgrip is an extenion library that provides widget-level programmable gesture
207- recognition for GTK+ applications natively within the toolkit. Widgets
208- subscribe to particular gestures and provide programmed functionality on
209- receipt of corresponding gesture events.
210- .
211- This package provides Python bindings so that you can use libgrip from
212- a Python program.
213
214=== modified file 'debian/gir1.2-grip.install'
215--- debian/gir1.2-grip.install 2012-11-23 00:39:06 +0000
216+++ debian/gir1.2-grip.install 2014-06-24 12:58:10 +0000
217@@ -1,1 +1,2 @@
218-debian/tmp/usr/lib/*/girepository-1.0
219+usr/lib/*/girepository-1.0
220+usr/lib/python*/*-packages/gi/overrides/*.py
221
222=== removed file 'debian/python-grip.install'
223--- debian/python-grip.install 2011-09-20 02:27:41 +0000
224+++ debian/python-grip.install 1970-01-01 00:00:00 +0000
225@@ -1,1 +0,0 @@
226-usr/lib/python*/*
227
228=== modified file 'debian/rules'
229--- debian/rules 2014-01-07 00:19:19 +0000
230+++ debian/rules 2014-06-24 12:58:10 +0000
231@@ -1,7 +1,7 @@
232 #!/usr/bin/make -f
233
234 %:
235- dh $@ --with python2,autoreconf
236+ dh $@ --with python2,python3,autoreconf
237
238 override_dh_autoreconf:
239 NOCONFIGURE=1 dh_autoreconf ./autogen.sh
240@@ -10,5 +10,10 @@
241 dh_auto_configure -- --enable-gtk-doc --disable-silent-rules
242
243 override_dh_install:
244+ PYTHON=python3 ./configure --prefix=/usr
245+ dh_auto_install -- -C bindings/python install
246 dh_install --fail-missing -X.a -X.la -X.pyc -X.pyo
247
248+override_dh_python3:
249+ dh_python3 debian/gir1.2-grip/usr/lib/python3
250+

Subscribers

People subscribed via source and target branches