gallery-app

Merge lp:~ted/gallery-app/single-instance into lp:gallery-app

  1. single-instance
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: 845
Proposed branch: lp:~ted/gallery-app/single-instance
Merge into: lp:gallery-app
Diff against target: 11 lines (+2/-1)
1 file modified
desktop/gallery-app.desktop.in (+2/-1)
To merge this branch: bzr merge lp:~ted/gallery-app/single-instance
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Bill Filler (community) Approve
Review via email: mp+186611@code.launchpad.net

Commit message

Adding single instance marker to the desktop file

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

FAILED: Continuous integration, rev:843
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/511/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/321
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/321/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3678
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1206/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3690
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3690/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1208
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1208/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1002/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1014

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

approved

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/gallery-app-autolanding/212/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-autolanding/125/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/125
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/125/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-autolanding/125/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3691
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1219/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3704
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3704/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1221
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1221/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1014/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1026

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Re-approving after resolving jenkins issues.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/gallery-app-autolanding/214/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-autolanding/127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/127
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/127/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-autolanding/127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3702
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1230
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3714
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3714/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1232
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1232/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1025
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1037

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/gallery-app-autolanding/218/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-autolanding/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/131
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/131/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-autolanding/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3747
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1275
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3759
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3759/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1277
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1277/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1066
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1078

review: Needs Fixing (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

approve

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Rerun failed job PASSED, ok to merge:
http://10.97.2.10:8080/job/generic-mediumtests-runner-maguro/1585/

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/gallery-app-autolanding/225/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/138
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/138/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'desktop/gallery-app.desktop.in'
2--- desktop/gallery-app.desktop.in 2013-06-14 16:15:24 +0000
3+++ desktop/gallery-app.desktop.in 2013-09-19 18:37:58 +0000
4@@ -14,4 +14,5 @@
5 Categories=Graphics;Photography;RasterGraphics;Viewer
6 X-Ayatana-Appmenu-Show-Stubs=false
7 X-Ubuntu-Touch=true
8-X-Ubuntu-Gettext-Domain=gallery-app
9\ No newline at end of file
10+X-Ubuntu-Gettext-Domain=gallery-app
11+X-Ubuntu-Single-Instance=true

Subscribers

People subscribed via source and target branches

to all changes: