messaging-app

Merge lp:~stolowski/messaging-app/default-department-id-key into lp:messaging-app

  1. default-department-id-key
  2. Merge into trunk
Proposed by Paweł Stołowski
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 156
Merged at revision: 216
Proposed branch: lp:~stolowski/messaging-app/default-department-id-key
Merge into: lp:messaging-app
Diff against target: 11 lines (+1/-0)
1 file modified
src/messaging-app.desktop.in.in (+1/-0)
To merge this branch: bzr merge lp:~stolowski/messaging-app/default-department-id-key
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
Olivier Tilloy Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+227591@code.launchpad.net

Commit message

Added X-Ubuntu-Default-Department-ID key to the desktop file. This is required by click scope to support departments for preinstalled applications.

Description of the change

Added X-Ubuntu-Default-Department-ID key to the desktop file. This is required by click scope to support departments for preinstalled applications.

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

FAILED: Continuous integration, rev:156
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/297/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2252
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1871
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/91
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/91/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/91
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2456
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3436
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3436/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10151
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1573
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2089
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2089/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/297/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) wrote :

LGTM.

review: Approve
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/messaging-app.desktop.in.in'
--- src/messaging-app.desktop.in.in 2014-07-16 15:26:33 +0000
+++ src/messaging-app.desktop.in.in 2014-07-21 15:25:48 +0000
@@ -9,6 +9,7 @@
9Icon=messaging-app9Icon=messaging-app
10MimeType=x-scheme-handler/contact;x-scheme-handler/call10MimeType=x-scheme-handler/contact;x-scheme-handler/call
11X-Ubuntu-Touch=true11X-Ubuntu-Touch=true
12X-Ubuntu-Default-Department-ID=accessories
12X-Ubuntu-StageHint=SideStage13X-Ubuntu-StageHint=SideStage
13X-Ubuntu-Single-Instance=true14X-Ubuntu-Single-Instance=true
14X-Screenshot=@CMAKE_INSTALL_PREFIX@/@MESSAGING_APP_DIR@/assets/messaging-app-screenshot.png15X-Screenshot=@CMAKE_INSTALL_PREFIX@/@MESSAGING_APP_DIR@/assets/messaging-app-screenshot.png

Subscribers

People subscribed via source and target branches