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

[Ying-Chun Liu]

Add X-Ubuntu-Touch field into desktop file.

Add X-Ubuntu-Touch field into desktop file.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/camera-app-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-i386-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-raring-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-raring-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-raring-i386-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/532
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/74

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

review: Needs Fixing (continuous-integration)

[Martin Mrazik (mrazik)]

Feel free to ignore the failure above. Its a bug/limitation on jenkins side which should not happen with the next build (and/or autolanding).

[lp:~paulliu/camera-app/desktop_file_tweak]

116. By Ying-Chun Liu on 2013-04-02

Add X-Ubuntu-Touch field into desktop files.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:116
http://jenkins.qa.ubuntu.com/job/camera-app-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-armhf-ci/13/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-i386-ci/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-raring-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-raring-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-raring-i386-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/546

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

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'camera-app.desktop'
--- camera-app.desktop	2012-09-26 11:22:50 +0000
+++ camera-app.desktop	2013-04-02 14:29:20 +0000
@@ -7,3 +7,4 @@
 Terminal=false
 Icon=camera-app
 #MimeType=x-scheme-handler/contact;x-scheme-handler/call
+X-Ubuntu-Touch=true
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-03-29 15:11:26 +0000
+++ debian/changelog	2013-04-02 14:29:20 +0000
@@ -1,3 +1,9 @@
+camera-app (2.8.1) quantal; urgency=low
+
+  * Add X-Ubuntu-Touch field into desktop files.
+
+ -- Ying-Chun Liu (PaulLiu) <[e-mail]>  Tue, 02 Apr 2013 22:25:14 +0800
+
 camera-app (2.8) quantal; urgency=low
 
   [Renato Filho]