Merge lp:~popey/dropping-letters/fix-1196865 into lp:dropping-letters

Status: Merged
Approved by: Michael Hall
Approved revision: 50
Merged at revision: 50
Proposed branch: lp:~popey/dropping-letters/fix-1196865
Merge into: lp:dropping-letters
Diff against target: 101 lines (+19/-17)
4 files modified
apparmor/dropping-letters.json (+2/-2)
debian/changelog (+3/-2)
dropping-letters.qml (+4/-3)
manifest.json (+10/-10)
To merge this branch: bzr merge lp:~popey/dropping-letters/fix-1196865
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Michael Hall Approve
Review via email: mp+218130@code.launchpad.net

Commit message

Re-enable sound effects

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

LGTM, popey says it's all good

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
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/dropping-letters.json'
2--- apparmor/dropping-letters.json 2014-05-02 12:27:11 +0000
3+++ apparmor/dropping-letters.json 2014-05-02 17:21:20 +0000
4@@ -1,4 +1,4 @@
5 {
6- "policy_groups": [],
7+ "policy_groups": [],
8 "policy_version": 1.1
9-}
10+}
11\ No newline at end of file
12
13=== modified file 'debian/changelog'
14--- debian/changelog 2014-05-02 12:27:11 +0000
15+++ debian/changelog 2014-05-02 17:21:20 +0000
16@@ -1,9 +1,10 @@
17-dropping-letters (0.1.2.3) UNRELEASED; urgency=medium
18+dropping-letters (0.1.2.4) raring; urgency=medium
19
20 * Add -qt5 command line option (LP: #1288885)
21 * Update click framework and apparmor profile version (LP: #1315318)
22+ * Re-enable sound effects (LP: #1196865)
23
24- -- Alan Pope <popey@ubuntu.com> Fri, 02 May 2014 13:26:36 +0100
25+ -- Alan Pope <popey@ubuntu.com> Fri, 02 May 2014 18:11:42 +0100
26
27 dropping-letters (0.1.2.2) raring; urgency=low
28
29
30=== modified file 'dropping-letters.qml'
31--- dropping-letters.qml 2014-04-29 14:18:05 +0000
32+++ dropping-letters.qml 2014-05-02 17:21:20 +0000
33@@ -60,7 +60,7 @@
34 // on devices. Set this to true when playback is fixed or
35 // find a way to fail gracefully. When this can be enabled again,
36 // be sure to uncomment all the Audio elements
37- property bool supportsMedia: false
38+ property bool supportsMedia: true
39 }
40
41 Flipable {
42@@ -294,7 +294,8 @@
43 }
44 }
45
46- /* Uncomment this out when volume.supportsMedia can be set to true
47+ /* Allow sounds but not music for now as music plays on, allow this once
48+ bug 1315454 is fixed
49 Audio {
50 id: music
51 source: "Easy_Lemon_60_second.ogg"
52@@ -306,6 +307,7 @@
53 }
54 muted: !volume.audible
55 }
56+ */
57
58 Audio {
59 id: click
60@@ -337,7 +339,6 @@
61 }
62 muted: !volume.audible
63 }
64- */
65
66 Rectangle {
67 id: bottombar
68
69=== modified file 'manifest.json'
70--- manifest.json 2014-05-02 12:27:11 +0000
71+++ manifest.json 2014-05-02 17:21:20 +0000
72@@ -1,18 +1,18 @@
73 {
74- "description": "Dropping Letters game",
75- "framework": "ubuntu-sdk-14.04-qml-dev1",
76+ "description": "Dropping Letters game",
77+ "framework": "ubuntu-sdk-14.04-qml-dev1",
78 "hooks": {
79 "dropping-letters": {
80- "apparmor": "apparmor/dropping-letters.json",
81+ "apparmor": "apparmor/dropping-letters.json",
82 "desktop": "dropping-letters.desktop"
83 }
84- },
85- "icon": "dropping-letters.png",
86- "maintainer": "Alan Pope <popey@ubuntu.com>",
87- "name": "com.ubuntu.dropping-letters",
88- "title": "dropping-letters",
89+ },
90+ "icon": "dropping-letters.png",
91+ "maintainer": "Alan Pope <popey@ubuntu.com>",
92+ "name": "com.ubuntu.dropping-letters",
93+ "title": "dropping-letters",
94 "version": "0.1.2.2",
95 "x-test": {
96- "autopilot": "dropping_letters_app"
97+ "autopilot": "dropping_letters_app"
98 }
99-}
100+}
101\ No newline at end of file

Subscribers

People subscribed via source and target branches