lp:~sergiusens/grail/update

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:grail/phablet at revision 250

Daniel d'Andrada (community): Approve on 2013-03-25

Diff: 1605 lines (+298/-649)

46 files modified

Makefile.am (+1/-0)
configure.ac (+2/-2)
debian/changelog (+45/-0)
debian/control (+2/-2)
debian/copyright (+3/-4)
m4/gtest.m4 (+13/-5)
m4/xorg-gtest.m4 (+2/-31)
src/handle.cpp (+1/-6)
src/touch.cpp (+2/-10)
test/integration/device.cpp (+2/-3)
test/integration/device.h (+2/-3)
test/integration/events.h (+2/-3)
test/integration/recording.cpp (+2/-3)
test/integration/recording.h (+2/-3)
test/integration/slice-checker.cpp (+2/-3)
test/integration/slice-checker.h (+2/-3)
test/integration/x11/atomic-timeout.cpp (+2/-3)
test/integration/x11/dragthresh.cpp (+2/-3)
test/integration/x11/fixture.cpp (+2/-3)
test/integration/x11/fixture.h (+2/-3)
test/integration/x11/hold-reject.cpp (+2/-3)
test/integration/x11/no-premature-gestures.cpp (+2/-3)
test/integration/x11/no-tap-after-drag.cpp (+2/-3)
test/integration/x11/parallel-atomic-gestures.cpp (+2/-3)
test/integration/x11/tap-touch-accept.cpp (+2/-3)
test/integration/x11/timeout.cpp (+2/-3)
test/integration/x11/twodrag.cpp (+2/-3)
test/regular/Makefile.am (+2/-3)
test/regular/frame_mock.cpp (+0/-254)
test/regular/frame_mock.h (+0/-66)
test/regular/grail-fixture.cpp (+133/-111)
test/regular/grail-fixture.h (+18/-20)
test/regular/intermittent_3touch.cpp (+1/-1)
test/regular/one-touch-gest-finished.cpp (+5/-24)
test/regular/pending-end.cpp (+9/-7)
test/regular/still-gest-finishes.cpp (+3/-19)
tools/common/device.c (+2/-3)
tools/common/device.h (+2/-3)
tools/common/servertime.c (+2/-3)
tools/common/servertime.h (+2/-3)
tools/common/slice.c (+2/-3)
tools/common/slice.h (+2/-3)
tools/grail-test-3-1.c (+2/-3)
tools/grail-test-atomic.c (+2/-3)
tools/grail-test-edge.c (+2/-3)
tools/grail-test-propagation.c (+2/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

250. By Sergio Schvezov on 2013-03-25

* Merging current branch into phablet series.
[ Stephen M. Webb ]
* New upstream release to pick up licensing changes.
[ Automatic PS uploader ]
* Automatic snapshot from revision 253
[ Daniel d'Andrada ]
* Relicense under (L)GPL version 3 *only* (no +)
* Updated libframe version dependency to 2.5.0
* Use frame_backend.h instead of a frame mock in tests
* Get rid of x11 specific code in grail implementation
[ Automatic PS uploader ]
* Automatic snapshot from revision 251
[ Robert Bruce Park ]
* Inline packaging metadata.
[ Didier Roche ]
* Automatic snapshot from revision 244 (bootstrap)
[ Daniel d'Andrada ]
* Updated libframe version dependency to 2.4.4
[ Automatic PS uploader ]
* Automatic snapshot from revision 247

249. By Ricardo Salveti on 2012-11-30

Releasing version for phablet.

Approved by Sergio Schvezov, PS Jenkins bot.

248. By Daniel d'Andrada on 2012-11-29

debian: make X11-free packages for phablet

247. By Daniel d'Andrada on 2012-11-29

Release version 3.0.9

246. By Daniel d'Andrada on 2012-11-29

Make grail build without X11

Enable grail to build without x11 libraries or dependencies.

Approved by Neil J. Patel.

245. By Didier Roche-Tolomelli on 2012-11-28

add bootstrap message.

Approved by Alan Pope.

244. By Robert Bruce Park on 2012-11-27

Add inline packaging.

Approved by Didier Roche.

243. By Daniel d'Andrada on 2012-11-09

Release version 3.0.8

242. By Daniel d'Andrada on 2012-11-09

Bump library and symbols versions

To signal ABI changes that are not backwards-compatible.

241. By Daniel d'Andrada on 2012-08-30

Release version 3.0.7

- To signal the new construction and destruction functions