gallery-app

Merge lp:~paulliu/gallery-app/desktop_file_tweak into lp:gallery-app

  1. desktop_file_tweak
  2. Merge into trunk
Proposed by Ying-Chun Liu
Status: Merged
Approved by: Günter Schwann
Approved revision: 633
Merged at revision: 633
Proposed branch: lp:~paulliu/gallery-app/desktop_file_tweak
Merge into: lp:gallery-app
Diff against target: 32 lines (+10/-2)
3 files modified
debian/changelog (+9/-0)
debian/gallery-app.links (+0/-2)
gallery-app.desktop (+1/-0)
To merge this branch: bzr merge lp:~paulliu/gallery-app/desktop_file_tweak
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Günter Schwann (community) Approve
Review via email: mp+156548@code.launchpad.net

Commit message

Add X-Ubuntu-Touch field into desktop file.

Description of the change

Add X-Ubuntu-Touch field into desktop file.

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

PASSED: Continuous integration, rev:630
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-i386-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/533

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

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

Looks good

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

PASSED: Continuous integration, rev:631
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-armhf-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-armhf-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-i386-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/547

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

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/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-armhf-autolanding/32
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-armhf-autolanding/32/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-i386-autolanding/32/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-autolanding/23
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-autolanding/23/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-autolanding/23/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/552

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

PASSED: Continuous integration, rev:631
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-armhf-ci/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-i386-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/32/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/559

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

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

FAILED: Continuous integration, rev:633
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-armhf-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-i386-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/33
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/563

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

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

PASSED: Continuous integration, rev:633
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/47/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-armhf-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-quantal-i386-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/566

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-03-29 14:12:23 +0000
3+++ debian/changelog 2013-04-02 14:45:25 +0000
4@@ -1,3 +1,12 @@
5+gallery-app (0.0.65) quantal; urgency=low
6+
7+ * Add X-Ubuntu-Touch field into desktop file.
8+ * Delete unused debian/gallery-app.links.
9+ - This file was used for compatibility. But it causes the gallery to
10+ be appeared twice.
11+
12+ -- Ying-Chun Liu (PaulLiu) <paul.liu@canonical.com> Tue, 02 Apr 2013 22:31:03 +0800
13+
14 gallery-app (0.0.64) quantal; urgency=low
15
16 * Update packaging:
17
18=== removed file 'debian/gallery-app.links'
19--- debian/gallery-app.links 2013-03-18 14:20:43 +0000
20+++ debian/gallery-app.links 1970-01-01 00:00:00 +0000
21@@ -1,2 +0,0 @@
22-/usr/bin/gallery-app /usr/bin/ubuntu-gallery
23-/usr/share/applications/gallery-app.desktop /usr/share/applications/ubuntu-gallery.desktop
24
25=== modified file 'gallery-app.desktop'
26--- gallery-app.desktop 2013-03-20 10:53:14 +0000
27+++ gallery-app.desktop 2013-04-02 14:45:25 +0000
28@@ -13,3 +13,4 @@
29 MimeType=image/jpg;image/jpeg
30 Categories=Graphics;Photography;RasterGraphics;Viewer
31 X-Ayatana-Appmenu-Show-Stubs=false
32+X-Ubuntu-Touch=true

Subscribers

People subscribed via source and target branches