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

Status: Merged
Approved by: David Planella on 2014-04-16
Approved revision: 45
Merged at revision: 46
Proposed branch: lp:~popey/dropping-letters/fix-1288885
Merge into: lp:dropping-letters
Diff against target: 25 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
dropping-letters.desktop (+1/-1)
To merge this branch: bzr merge lp:~popey/dropping-letters/fix-1288885
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-04-16
David Planella 2014-03-10 Approve on 2014-04-15
Victor Thompson (community) Approve on 2014-03-22
Dropping Letters developers 2014-04-16 Pending
Review via email: mp+210179@code.launchpad.net

Commit message

To post a comment you must log in.
Victor Thompson (vthompson) wrote :

Changes look good and fall in line with what other core apps have done to fix this.

review: Approve
David Planella (dpm) wrote :

LGTM

review: Approve
review: Approve (continuous-integration)

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://91.189.93.70:8080/job/dropping-letters-autolanding/10/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/dropping-letters-saucy-amd64-autolanding/10
    SUCCESS: http://91.189.93.70:8080/job/dropping-letters-trusty-amd64-autolanding/6
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2141

review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)

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-05-08 22:22:08 +0000
3+++ debian/changelog 2014-03-10 10:38:23 +0000
4@@ -1,3 +1,9 @@
5+dropping-letters (0.1.2.2ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Add -qt5 command line option (LP: #1288885)
8+
9+ -- Alan Pope <popey@ubuntu.com> Mon, 10 Mar 2014 10:24:40 +0000
10+
11 dropping-letters (0.1.2.2) raring; urgency=low
12
13 * Fixed path to the QML file in the launcher
14
15=== modified file 'dropping-letters.desktop'
16--- dropping-letters.desktop 2013-10-09 19:30:26 +0000
17+++ dropping-letters.desktop 2014-03-10 10:38:23 +0000
18@@ -4,7 +4,7 @@
19 Icon=/usr/share/dropping-letters/dropping-letters.png
20 Terminal=false
21 Name=Dropping Letters
22-Exec=qmlscene /usr/share/dropping-letters/dropping-letters.qml
23+Exec=qmlscene -qt5 /usr/share/dropping-letters/dropping-letters.qml
24 X-Ubuntu-Touch=true
25 X-Ubuntu-StageHint=SideStage
26

Subscribers

People subscribed via source and target branches