Merge lp:~sergiusens/stock-ticker-mobile-app/click into lp:stock-ticker-mobile-app

Proposed by Sergio Schvezov
Status: Merged
Approved by: Michael Hall
Approved revision: 69
Merged at revision: 64
Proposed branch: lp:~sergiusens/stock-ticker-mobile-app/click
Merge into: lp:stock-ticker-mobile-app
Diff against target: 62 lines (+18/-5)
4 files modified
Stock_Ticker.qml (+1/-1)
debian/install (+0/-1)
manifest.json (+15/-0)
stock-ticker-app.desktop (+2/-3)
To merge this branch: bzr merge lp:~sergiusens/stock-ticker-mobile-app/click
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Michael Hall Approve
Review via email: mp+190238@code.launchpad.net

Commit message

Upstreaming click

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

LGTM

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
69. By Sergio Schvezov

Fixing debian packaging broken from revno 58

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Stock_Ticker.qml'
2--- Stock_Ticker.qml 2013-09-04 01:51:45 +0000
3+++ Stock_Ticker.qml 2013-10-10 01:17:15 +0000
4@@ -26,7 +26,7 @@
5 MainView {
6 // objectName for functional testing purposes (autopilot-qt5)
7 objectName: "stockTicker"
8- applicationName: "stock-ticker-app"
9+ applicationName: "com.ubuntu.stock-ticker-mobile"
10 width: units.gu(40)
11 height: units.gu(75)
12 id: mainProgram
13
14=== modified file 'debian/install'
15--- debian/install 2013-07-11 00:50:28 +0000
16+++ debian/install 2013-10-10 01:17:15 +0000
17@@ -21,7 +21,6 @@
18 Stock_Component_News.qml /usr/share/stock-ticker-mobile-app
19 Stock_Ticker.qml /usr/share/stock-ticker-mobile-app
20 javascript /usr/share/stock-ticker-mobile-app
21-javascript/storage.js /usr/share/stock-ticker-mobile-app
22 javascript/graph.js /usr/share/stock-ticker-mobile-app
23 img /usr/share/stock-ticker-mobile-app
24 img/stock_refresh.png /usr/share/stock-ticker-mobile-app
25
26=== added file 'manifest.json'
27--- manifest.json 1970-01-01 00:00:00 +0000
28+++ manifest.json 2013-10-10 01:17:15 +0000
29@@ -0,0 +1,15 @@
30+{
31+ "description": "A stock trading app with charts, news, and management",
32+ "framework": "ubuntu-sdk-13.10",
33+ "hooks": {
34+ "stock-ticker-mobile": {
35+ "apparmor": "apparmor/stock-ticker-mobile.json",
36+ "desktop": "stock-ticker-app.desktop"
37+ }
38+ },
39+ "icon": "icons/stock_icon_48.png",
40+ "maintainer": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
41+ "name": "com.ubuntu.stock-ticker-mobile",
42+ "title": "stock-ticker-mobile",
43+ "version": "0.3.7"
44+}
45
46=== modified file 'stock-ticker-app.desktop'
47--- stock-ticker-app.desktop 2013-07-04 22:49:40 +0000
48+++ stock-ticker-app.desktop 2013-10-10 01:17:15 +0000
49@@ -1,6 +1,5 @@
50 [Desktop Entry]
51-Encoding=UTF-8
52-Version=0.3.2
53+Version=1.0
54 Name=Stock Ticker
55 GenericName=Stock Ticker
56 Comment=An awesome Stock Ticker application with all the features you could imagine
57@@ -10,4 +9,4 @@
58 Type=Application
59 X-Ubuntu-Touch=true
60 X-Ubuntu-StageHint=SideStage
61-Categories=Utility;Application;
62+Categories=Utility;

Subscribers

People subscribed via source and target branches