Merge lp:~nskaggs/ubuntu-calendar-app/revert-workaround-code into lp:ubuntu-calendar-app

[Nicholas Skaggs]

Revert accidentally merged code

Revert accidentally merged code by renato as part of

https://code.launchpad.net/~renatofilho/ubuntu-calendar-app/fix-1311125/+merge/217251

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:301
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/514/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2887/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2887/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/348
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/72

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/514/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

This is likely to be rejected by jenkins because of the regression that's in trunk:

https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1326963

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:301
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/516/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2899/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2899/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/426
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/426/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/350
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/74

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/516/rebuild

review: Needs Fixing (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

looks like its caused by unmet dependency for qtdeclarative5-ubuntu-syncmonitor0.1

The following packages have unmet dependencies:
 calendar-app : Depends: qtdeclarative5-ubuntu-syncmonitor0.1 but it is not installable
E: Unable to correct problems, you have held broken packages.

[Kunal Parmar (pkunal-parmar)]

looks good to me

review: Approve

[Nicholas Skaggs (nskaggs)]

Yea, syncmonitor doesn't exist in trunk for trusty, so :-)

As expected, MismatchError: After 10.0 seconds test on NewEventEntryField.activeFocus failed: True != dbus.Boolean(False, variant_level=1).

[David Planella (dpm)]

I've now build qtdeclarative5-ubuntu-syncmonitor0.1 in the core apps PPA for trusty, so the unmet dependency failure should be fixed.

[Nicholas Skaggs (nskaggs)]

Once https://code.launchpad.net/~nskaggs/ubuntu-calendar-app/datepicker-test-fixes/+merge/222369 lands, this should land easily.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:301
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/531/
Executed test runs:
    None: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2919/console
    None: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/365/console
    None: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/89/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/531/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'calendar.qml'
--- calendar.qml	2014-06-05 12:08:18 +0000
+++ calendar.qml	2014-06-05 20:02:21 +0000
@@ -2,19 +2,12 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.SyncMonitor 0.1
-import QtQuick.Window 2.0
-
 import "dateExt.js" as DateExt
 
 MainView {
     id: mainView
     useDeprecatedToolbar: false
 
-    // Work-around until this branch lands:
-    // https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/optIn-tabsDrawer/+merge/212496
-    property bool windowActive: typeof window != 'undefined'
-    onWindowActiveChanged: window.title = i18n.tr("Calendar")
-
     // Argument during startup
     Arguments {
         id: args;