lp:~andrew-haigh-b/cdts/fresh-trunk

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2230. By Andrew Haigh on 2013-07-04

plainbox-gui: add initial plainbox-gui code

This new part implements a Qt5 + QML2 + Ubuntu Touch Components based
user interface on top of DBus services exported by PlainBox. The code
here is basically the skeleton that doesn't do much by itself yet (it
can only quit by asking the PlainBox service to exit) but sets the stage
for future development.

This code pulls in new dependencies for testing: there are two new PPAs
to get Qt5 + Ubuntu Touch components on Ubuntu Precise (and onward) and
installs a few related packages. It also runs a simple build smoke test
via test-in-vagrant.sh.

Signed-off-by: Zygmunt Krynicki <email address hidden>

2229. By Zygmunt Krynicki on 2013-07-04

"[r=zkrynicki,roadmr,brendan-donegan][bug=][author=zkrynicki] automatic merge by tarmac"

2228. By Alberto Milone on 2013-07-04

"[r=brendan-donegan][bug=][author=albertomilone] checkbox-old/scripts/color_depth_info:
1) Prevent a UnicodeDecodeError. I can reproduce this with Python 3 in Saucy (the one in Precise works fine)
2) Be more strict in the regex so that we don't catch undesired strings."

2227. By Zygmunt Krynicki on 2013-07-04

"[r=zkrynicki][bug=][author=zkrynicki] automatic merge by tarmac"

2226. By Daniel Manrique on 2013-07-04

"[r=zkrynicki][bug=][author=roadmr] Syncs the packaging branches. The only differences should be:

- changelog differences
- checkbox/debian does not reference checkbox-old.
- checkbox refers to itself (checkbox trunk) in the control Vcs-Bzr field.

Also see this merge request for the syncing changes to checkbox-packaging.

https://code.launchpad.net/~roadmr/checkbox/packaging-sync-packaging/+merge/172911"

2225. By Brendan Donegan on 2013-07-04

"[r=roadmr][bug=1196838][author=brendan-donegan] automatic merge by tarmac"

2224. By Brendan Donegan on 2013-07-03

"[r=bladernr][bug=1184661][author=brendan-donegan] automatic merge by tarmac"

2223. By Zygmunt Krynicki on 2013-07-02

"[r=sylvain-pineau][bug=][author=zkrynicki] automatic merge by tarmac"

2222. By Zygmunt Krynicki on 2013-07-02

"[r=sylvain-pineau][bug=][author=zkrynicki] automatic merge by tarmac"

2221. By Zygmunt Krynicki on 2013-07-02

"[r=sylvain-pineau][bug=][author=zkrynicki] automatic merge by tarmac"