Merge lp:~aacid/unity/jenkins_mesa_dri into lp:unity/phablet

[Albert Astals Cid]

Qt declarative needs libgl1-mesa-dri on runtime

Add it to our build depends so the tests do actually pass on jenkins

[Michael Zanetti (mzanetti)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:654
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/841/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/746
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/717
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/717/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/721
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1413

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/841/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:654
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/843/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/749
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/719
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/719/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/723

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/843/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/297/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/758
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/231
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/231/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/231

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/301/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/765/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/235/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/235/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/302/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/766/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/236/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/236/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:657
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/849/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/767
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/725
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/725/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/729

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/849/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/303/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/768
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/237
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/237/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/237

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/305/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/773
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/239
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/239/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/239

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:658
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/855/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/776
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/731
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/731/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/735

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/855/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:659
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/856/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/777
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/732
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/732/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/736

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/856/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:660
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/859/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/780
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/735
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/735/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/739

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/859/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:661
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/860/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/782
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/736
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/736/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/740

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/860/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/307/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/783
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/241
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/241/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/241

review: Needs Fixing (continuous-integration)

[Ying-Chun Liu (paulliu)]

Works for me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-04-25 18:50:40 +0000
+++ debian/control	2013-05-07 10:21:28 +0000
@@ -11,6 +11,7 @@
                libboost1.49-dev (>= 1.49),
                libdee-qt5-dev (>= 3.0),
                libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
+               libgl1-mesa-dri,
                libgles2-mesa-dev[armhf],
                libgtest-dev,
                libhud-client2-dev,

=== modified file 'tests/qmltests/Dash/tst_PeoplePreview.qml'
--- tests/qmltests/Dash/tst_PeoplePreview.qml	2013-05-03 22:23:27 +0000
+++ tests/qmltests/Dash/tst_PeoplePreview.qml	2013-05-07 10:21:28 +0000
@@ -225,6 +225,7 @@
         }
 
         function verifyClick(field) {
+            waitForRendering(field)
             clickSpy.signalName = "" // Get rid of a warning if new target doesn't support previous signal name
             clickSpy.target = field;
             clickSpy.clear();
@@ -235,6 +236,7 @@
         }
 
         function verifyPhoneNumberClick(field) {
+            waitForRendering(field)
             clickSpy.target = field;
             clickSpy.clear();
             clickSpy.signalName = "phoneClicked";