share-app

Merge lp:~ken-vandine/share-app/friends0.2 into lp:share-app

  1. friends0.2
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Günter Schwann
Approved revision: 80
Merged at revision: 80
Proposed branch: lp:~ken-vandine/share-app/friends0.2
Merge into: lp:share-app
Diff against target: 25 lines (+2/-2)
2 files modified
debian/control (+1/-1)
main.qml (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/share-app/friends0.2
Reviewer Review Type Date Requested Status
Günter Schwann (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+182894@code.launchpad.net

Commit message

Updated for qtdeclarative5-friends0.2

Description of the change

Updated for qtdeclarative5-friends0.2

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:80
http://jenkins.qa.ubuntu.com/job/share-app-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2795
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/396/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/share-app-saucy-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/share-app-saucy-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/share-app-saucy-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/share-app-saucy-i386-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2801
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2801/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/398
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/398/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/359/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/366

Click here to trigger a rebuild:
http://s-jenkins:8080/job/share-app-ci/39/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:80
http://jenkins.qa.ubuntu.com/job/share-app-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2796
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/397
    SUCCESS: http://jenkins.qa.ubuntu.com/job/share-app-saucy-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/share-app-saucy-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/share-app-saucy-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/share-app-saucy-i386-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2802
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2802/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2372
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/399
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/399/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/360
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/367

Click here to trigger a rebuild:
http://s-jenkins:8080/job/share-app-ci/40/rebuild

review: Approve (continuous-integration)
Revision history for this message
Günter Schwann (schwann) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-07-16 16:14:21 +0000
3+++ debian/control 2013-08-29 13:15:12 +0000
4@@ -33,7 +33,7 @@
5 libaccounts-qt5-1,
6 libnotify4,
7 qtdeclarative5-accounts-plugin,
8- qtdeclarative5-friends-plugin,
9+ qtdeclarative5-friends0.2,
10 libnotify-bin,
11 Description: Sharing application
12 An application to share data to different online services
13
14=== modified file 'main.qml'
15--- main.qml 2013-06-12 18:47:08 +0000
16+++ main.qml 2013-08-29 13:15:12 +0000
17@@ -17,7 +17,7 @@
18 import QtQuick 2.0
19 import Ubuntu.Components 0.1
20 import ShareApp 0.1
21-import Friends 0.1
22+import Friends 0.2
23 import Ubuntu.HUD 1.0 as HUD
24 import QtQuick.Window 2.0
25 import Ubuntu.OnlineAccounts 0.1

Subscribers

People subscribed via source and target branches