ubuntu-system-settings

Merge lp:~stolowski/ubuntu-system-settings/default-department-id-key into lp:ubuntu-system-settings

  1. default-department-id-key
  2. Merge into trunk
Proposed by Paweł Stołowski
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 817
Merged at revision: 825
Proposed branch: lp:~stolowski/ubuntu-system-settings/default-department-id-key
Merge into: lp:ubuntu-system-settings
Diff against target: 8 lines (+1/-0)
1 file modified
ubuntu-system-settings.desktop.in (+1/-0)
To merge this branch: bzr merge lp:~stolowski/ubuntu-system-settings/default-department-id-key
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+227594@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
Sebastien Bacher (seb128) wrote :

thanks, do you have a reference document/spec for that key, what it means, how it's used/what are the valid values?

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

FAILED: Continuous integration, rev:817
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1030/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1869
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/222
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/222/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/222
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2454
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3434
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3434/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1572
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2088
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2088/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1030/rebuild

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

PASSED: Continuous integration, rev:817
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1031/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2289
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1890
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/223
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/223/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2484
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3494
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3494/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10201
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1587
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2120
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2120/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1031/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

Discussed this over email, the solution is for RTM and might be changed later, the details are going to be published on the wiki/mailing list, approving then

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-system-settings.desktop.in'
2--- ubuntu-system-settings.desktop.in 2014-01-13 14:22:41 +0000
3+++ ubuntu-system-settings.desktop.in 2014-07-21 15:30:34 +0000
4@@ -12,3 +12,4 @@
5 X-Ubuntu-Touch=true
6 X-Ubuntu-StageHint=SideStage
7 X-Ubuntu-Single-Instance=true
8+X-Ubuntu-Default-Department-ID=accessories

Subscribers

People subscribed via source and target branches