Ubuntu Music App

Merge lp:~popey/music-app/fix-1288885 into lp:music-app/trusty

  1. fix-1288885
  2. Merge into trusty
Proposed by Alan Pope 🍺🐧🐱 🦄
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 376
Merged at revision: 374
Proposed branch: lp:~popey/music-app/fix-1288885
Merge into: lp:music-app/trusty
Diff against target: 26 lines (+4/-1)
2 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+3/-0)
To merge this branch: bzr merge lp:~popey/music-app/fix-1288885
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Andrew Hayzen Approve
Review via email: mp+210175@code.launchpad.net

Commit message

fix lp:1288885

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:373
http://91.189.93.70:8080/job/music-app-ci/637/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1656
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/637
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/639
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/358

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/637/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Looks good, but you'll need to resolve the merge conflict :(

review: Approve
lp:~popey/music-app/fix-1288885 updated
374. By Alan Pope 🍺🐧🐱 🦄

resolve conflict

375. By Alan Pope 🍺🐧🐱 🦄

Put right what once went wrong

376. By Alan Pope 🍺🐧🐱 🦄

Once more unto the breach

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:374
http://91.189.93.70:8080/job/music-app-ci/638/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1676
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/638
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/640
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/359

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/638/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-03-06 12:37:41 +0000
+++ CMakeLists.txt 2014-03-10 21:52:54 +0000
@@ -25,7 +25,7 @@
25 set(CMAKE_INSTALL_BINDIR /)25 set(CMAKE_INSTALL_BINDIR /)
26 set(DATA_DIR /)26 set(DATA_DIR /)
27 set(ICON ${ICON_FILE})27 set(ICON ${ICON_FILE})
28 set(EXEC "qmlscene ${MAIN_QML} --file=%f -I ./plugins")28 set(EXEC "qmlscene -qt5 ${MAIN_QML} --file=%f -I ./plugins")
29 set(DESKTOP_DIR ${DATA_DIR})29 set(DESKTOP_DIR ${DATA_DIR})
30 set(URLS_DIR ${DATA_DIR})30 set(URLS_DIR ${DATA_DIR})
31else(CLICK_MODE)31else(CLICK_MODE)
3232
=== modified file 'debian/changelog'
--- debian/changelog 2014-03-10 18:14:19 +0000
+++ debian/changelog 2014-03-10 21:52:54 +0000
@@ -8,6 +8,9 @@
8 [ Dimitri John Ledkov ]8 [ Dimitri John Ledkov ]
9 * Use python 3 compatible mock import9 * Use python 3 compatible mock import
1010
11 [ Alan Pope ]
12 * Add -qt5 command line option [lp:#1288885]
13
11 [ Victor Thompson ]14 [ Victor Thompson ]
12 * Add an autopilot test to test playing a song from the Artists tab. [lp:#1268455]15 * Add an autopilot test to test playing a song from the Artists tab. [lp:#1268455]
13 * Remove duplicate quit in HUD and move back button so visible [lp:#1285838]16 * Remove duplicate quit in HUD and move back button so visible [lp:#1285838]

Subscribers

People subscribed via source and target branches

to status/vote changes: