Merge lp:~sergiusens/ubuntu-terminal-app/click_improvements into lp:ubuntu-terminal-app

Proposed by Sergio Schvezov
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 29
Merged at revision: 27
Proposed branch: lp:~sergiusens/ubuntu-terminal-app/click_improvements
Merge into: lp:ubuntu-terminal-app
Diff against target: 20 lines (+6/-1)
2 files modified
plugins.json (+6/-0)
ubuntu-terminal-app.desktop (+0/-1)
To merge this branch: bzr merge lp:~sergiusens/ubuntu-terminal-app/click_improvements
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Review via email: mp+190686@code.launchpad.net

Commit message

Removing obsolete encoding from desktop. Adding plugins.json to track the embedded plugins used.

To post a comment you must log in.
28. By Sergio Schvezov

Adding plugins to be download when creating click

29. By Sergio Schvezov

Add missing ,

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

$ phablet-test-run ubuntu_terminal_app
adbd is already running as root
Loading tests from: /home/phablet/autopilot

Tests running...
__pthread_gettid -2
initctl: Unknown instance: com.ubuntu.terminal_terminal_0.5.29
initctl: Unknown instance: com.ubuntu.terminal_terminal_0.5.29
initctl: Unknown instance: com.ubuntu.terminal_terminal_0.5.29
initctl: Unknown instance: com.ubuntu.terminal_terminal_0.5.29
initctl: Unknown instance: com.ubuntu.terminal_terminal_0.5.29
initctl: Unknown instance: com.ubuntu.terminal_terminal_0.5.29
initctl: Unknown instance: com.ubuntu.terminal_terminal_0.5.29

Ran 7 tests in 127.984s
OK

Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) :
review: Approve
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=== added file 'plugins.json'
2--- plugins.json 1970-01-01 00:00:00 +0000
3+++ plugins.json 2013-10-11 14:30:36 +0000
4@@ -0,0 +1,6 @@
5+[
6+{
7+ "package": "qtdeclarative5-konsole-qml-plugin",
8+ "ppa": "ppa:ubuntu-touch-coreapps-drivers/daily"
9+}
10+]
11
12=== modified file 'ubuntu-terminal-app.desktop'
13--- ubuntu-terminal-app.desktop 2013-04-23 20:42:10 +0000
14+++ ubuntu-terminal-app.desktop 2013-10-11 14:30:36 +0000
15@@ -1,5 +1,4 @@
16 [Desktop Entry]
17-Encoding=UTF-8
18 Version=1.0
19 Type=Application
20 Terminal=false

Subscribers

People subscribed via source and target branches