webapps-demo

Merge lp:~paulliu/webapps-demo/desktop_file_tweak into lp:webapps-demo

  1. desktop_file_tweak
  2. Merge into trunk
Proposed by Ying-Chun Liu
Status: Merged
Approved by: Bill Filler
Approved revision: 20
Merged at revision: 18
Proposed branch: lp:~paulliu/webapps-demo/desktop_file_tweak
Merge into: lp:webapps-demo
Diff against target: 117 lines (+22/-0)
12 files modified
debian/changelog (+7/-0)
desktopFiles/amazon-webapp.desktop (+1/-0)
desktopFiles/calculator-mockapp.desktop (+2/-0)
desktopFiles/ebay-webapp.desktop (+1/-0)
desktopFiles/facebook-webapp.desktop (+2/-0)
desktopFiles/gmail-webapp.desktop (+1/-0)
desktopFiles/music-player-mockapp.desktop (+1/-0)
desktopFiles/qmlscene.desktop (+1/-0)
desktopFiles/ski-safari-mockapp.desktop (+1/-0)
desktopFiles/twitter-webapp.desktop (+2/-0)
desktopFiles/ubuntuone-webapp.desktop (+1/-0)
desktopFiles/weather-mockapp.desktop (+2/-0)
To merge this branch: bzr merge lp:~paulliu/webapps-demo/desktop_file_tweak
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+156542@code.launchpad.net

Commit message

Add X-Ubuntu-Touch=true and X-Ubuntu-StageHint=SideStage into some of
the desktop files.

Description of the change

Add X-Ubuntu-Touch field and X-Ubuntu-StageHint field into desktop files.

To post a comment you must log in.
Revision history for this message
Ying-Chun Liu (paulliu) wrote :

Add X-Ubuntu-Touch=true and X-Ubuntu-StageHint=SideStage into some of
the desktop files.

lp:~paulliu/webapps-demo/desktop_file_tweak updated
19. By Ying-Chun Liu

Fix incorrect fields in desktop files.

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

PASSED: Continuous integration, rev:18
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-quantal-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-quantal-i386-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webapps-demo-ci/1/rebuild

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

PASSED: Continuous integration, rev:19
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-quantal-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-quantal-i386-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webapps-demo-ci/2/rebuild

review: Approve (continuous-integration)
lp:~paulliu/webapps-demo/desktop_file_tweak updated
20. By Ying-Chun Liu

Add X-Ubuntu-Touch=true and/or X-Ubuntu-StageHint=SideStage into some of
the desktop files.

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

PASSED: Continuous integration, rev:20
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-quantal-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-quantal-i386-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webapps-demo-ci/3/rebuild

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

approved

review: Approve

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-08 15:52:15 +0000
3+++ debian/changelog 2013-04-02 14:54:29 +0000
4@@ -1,3 +1,10 @@
5+webapps-demo (0.12) quantal; urgency=low
6+
7+ * Add X-Ubuntu-Touch=true and/or X-Ubuntu-StageHint=SideStage into some of
8+ the desktop files.
9+
10+ -- Ying-Chun Liu (PaulLiu) <paul.liu@canonical.com> Tue, 02 Apr 2013 22:53:09 +0800
11+
12 webapps-demo (0.11) quantal; urgency=low
13
14 * ubuntu-browser was renamed webbrowser-app.
15
16=== modified file 'desktopFiles/amazon-webapp.desktop'
17--- desktopFiles/amazon-webapp.desktop 2013-03-08 15:51:16 +0000
18+++ desktopFiles/amazon-webapp.desktop 2013-04-02 14:54:29 +0000
19@@ -4,3 +4,4 @@
20 Exec=webbrowser-app --chromeless http://m.amazon.com
21 Name=Amazon
22 Icon=amazon
23+X-Ubuntu-Touch=true
24
25=== modified file 'desktopFiles/calculator-mockapp.desktop'
26--- desktopFiles/calculator-mockapp.desktop 2013-02-15 20:29:14 +0000
27+++ desktopFiles/calculator-mockapp.desktop 2013-04-02 14:54:29 +0000
28@@ -6,3 +6,5 @@
29 Exec=/usr/bin/qmlscene /usr/share/demo-mock-apps/calculator.qml
30 Terminal=false
31 Icon=calculator
32+X-Ubuntu-Touch=true
33+X-Ubuntu-StageHint=SideStage
34
35=== modified file 'desktopFiles/ebay-webapp.desktop'
36--- desktopFiles/ebay-webapp.desktop 2013-03-08 15:51:16 +0000
37+++ desktopFiles/ebay-webapp.desktop 2013-04-02 14:54:29 +0000
38@@ -4,3 +4,4 @@
39 Exec=webbrowser-app --chromeless http://ebay.com
40 Name=eBay
41 Icon=ebay
42+X-Ubuntu-Touch=true
43
44=== modified file 'desktopFiles/facebook-webapp.desktop'
45--- desktopFiles/facebook-webapp.desktop 2013-03-08 15:51:16 +0000
46+++ desktopFiles/facebook-webapp.desktop 2013-04-02 14:54:29 +0000
47@@ -4,3 +4,5 @@
48 Exec=webbrowser-app --chromeless http://m.facebook.com
49 Name=Facebook
50 Icon=facebook
51+X-Ubuntu-Touch=true
52+X-Ubuntu-StageHint=SideStage
53
54=== modified file 'desktopFiles/gmail-webapp.desktop'
55--- desktopFiles/gmail-webapp.desktop 2013-03-08 15:51:16 +0000
56+++ desktopFiles/gmail-webapp.desktop 2013-04-02 14:54:29 +0000
57@@ -4,3 +4,4 @@
58 Exec=webbrowser-app --chromeless https://gmail.com
59 Name=Gmail
60 Icon=gmail
61+X-Ubuntu-Touch=true
62
63=== modified file 'desktopFiles/music-player-mockapp.desktop'
64--- desktopFiles/music-player-mockapp.desktop 2013-02-16 02:18:38 +0000
65+++ desktopFiles/music-player-mockapp.desktop 2013-04-02 14:54:29 +0000
66@@ -6,3 +6,4 @@
67 Exec=/usr/bin/qmlscene /usr/share/demo-mock-apps/music.qml
68 Terminal=false
69 Icon=music
70+X-Ubuntu-Touch=true
71
72=== modified file 'desktopFiles/qmlscene.desktop'
73--- desktopFiles/qmlscene.desktop 2013-02-18 11:21:51 +0000
74+++ desktopFiles/qmlscene.desktop 2013-04-02 14:54:29 +0000
75@@ -5,3 +5,4 @@
76 Name=QML runner
77 GenericName=QML runner
78 Icon=ubuntu-qmlrunner
79+NoDisplay=true
80
81=== modified file 'desktopFiles/ski-safari-mockapp.desktop'
82--- desktopFiles/ski-safari-mockapp.desktop 2013-02-16 02:18:38 +0000
83+++ desktopFiles/ski-safari-mockapp.desktop 2013-04-02 14:54:29 +0000
84@@ -6,3 +6,4 @@
85 Exec=/usr/bin/qmlscene /usr/share/demo-mock-apps/ski-safari.qml
86 Terminal=false
87 Icon=ski-safari
88+X-Ubuntu-Touch=true
89
90=== modified file 'desktopFiles/twitter-webapp.desktop'
91--- desktopFiles/twitter-webapp.desktop 2013-03-08 15:51:16 +0000
92+++ desktopFiles/twitter-webapp.desktop 2013-04-02 14:54:29 +0000
93@@ -4,3 +4,5 @@
94 Exec=webbrowser-app --chromeless http://mobile.twitter.com
95 Name=Twitter
96 Icon=twitter
97+X-Ubuntu-Touch=true
98+X-Ubuntu-StageHint=SideStage
99
100=== modified file 'desktopFiles/ubuntuone-webapp.desktop'
101--- desktopFiles/ubuntuone-webapp.desktop 2013-03-08 15:51:16 +0000
102+++ desktopFiles/ubuntuone-webapp.desktop 2013-04-02 14:54:29 +0000
103@@ -4,3 +4,4 @@
104 Exec=webbrowser-app --chromeless http://one.ubuntu.com
105 Name=Ubuntu One
106 Icon=ubuntuone
107+X-Ubuntu-Touch=true
108
109=== modified file 'desktopFiles/weather-mockapp.desktop'
110--- desktopFiles/weather-mockapp.desktop 2013-02-15 20:29:14 +0000
111+++ desktopFiles/weather-mockapp.desktop 2013-04-02 14:54:29 +0000
112@@ -6,3 +6,5 @@
113 Exec=/usr/bin/qmlscene /usr/share/demo-mock-apps/weather.qml
114 Terminal=false
115 Icon=weather
116+X-Ubuntu-Touch=true
117+X-Ubuntu-StageHint=SideStage

Subscribers

People subscribed via source and target branches