Ubuntu Music App

Merge lp:~sergiusens/music-app/click_fixes into lp:music-app/trusty

  1. click_fixes
  2. Merge into trusty
Proposed by Sergio Schvezov
Status: Merged
Approved by: Michael Hall
Approved revision: 165
Merged at revision: 161
Proposed branch: lp:~sergiusens/music-app/click_fixes
Merge into: lp:music-app/trusty
Diff against target: 62 lines (+12/-6)
5 files modified
apparmor/music.json (+1/-3)
music-app.desktop (+0/-1)
music-app.qml (+1/-1)
plugins.json (+9/-0)
tests/autopilot/music_app/tests/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~sergiusens/music-app/click_fixes
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Review via email: mp+189851@code.launchpad.net

Commit message

Using the unconfined template, adding list of plugins to download for setup; applicationName fixes and removal of incorrect use of sidestage hint in desktop file

To post a comment you must log in.
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=== modified file 'apparmor/music.json'
2--- apparmor/music.json 2013-10-07 13:21:39 +0000
3+++ apparmor/music.json 2013-10-08 13:40:57 +0000
4@@ -1,6 +1,4 @@
5 {
6- "policy_groups": [
7- "unconfined"
8- ],
9+ "template": "unconfined",
10 "policy_version": 1.0
11 }
12
13=== modified file 'music-app.desktop'
14--- music-app.desktop 2013-09-25 19:17:31 +0000
15+++ music-app.desktop 2013-10-08 13:40:57 +0000
16@@ -9,6 +9,5 @@
17 Type=Application
18 StartupNotify=true
19 X-Ubuntu-Single-Instance=true
20-X-Ubuntu-StageHint=music-app
21 X-Ubuntu-Touch=true
22 Name[sv_SE]=Musik
23
24=== modified file 'music-app.qml'
25--- music-app.qml 2013-10-07 23:21:17 +0000
26+++ music-app.qml 2013-10-08 13:40:57 +0000
27@@ -36,7 +36,7 @@
28
29 MainView {
30 objectName: "music"
31- applicationName: "music-app"
32+ applicationName: "com.ubuntu.music"
33 id: mainView
34
35 // Arguments during startup
36
37=== added file 'plugins.json'
38--- plugins.json 1970-01-01 00:00:00 +0000
39+++ plugins.json 2013-10-08 13:40:57 +0000
40@@ -0,0 +1,9 @@
41+[
42+{
43+ "package": "qtdeclarative5-qtpowerd0.1",
44+ "ppa": "ppa:ubuntu-touch-coreapps-drivers/daily"
45+},
46+{
47+ "package": "qtdeclarative5-qtgrilo0.1"
48+}
49+]
50
51=== modified file 'tests/autopilot/music_app/tests/__init__.py'
52--- tests/autopilot/music_app/tests/__init__.py 2013-10-02 20:23:15 +0000
53+++ tests/autopilot/music_app/tests/__init__.py 2013-10-08 13:40:57 +0000
54@@ -68,7 +68,7 @@
55
56 def launch_test_click(self):
57 self.app = self.launch_click_package(
58- "com.ubuntu.music-app",
59+ "com.ubuntu.music",
60 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
61
62 def _patch_home(self):

Subscribers

People subscribed via source and target branches

to status/vote changes: