Ubuntu Music App

Merge lp:~ken-vandine/music-app/content-hub-desktop into lp:music-app

  1. content-hub-desktop
  2. Merge into trunk
Proposed by Ken VanDine
Status: Superseded
Proposed branch: lp:~ken-vandine/music-app/content-hub-desktop
Merge into: lp:music-app
Diff against target: 96 lines (+20/-8)
4 files modified
CMakeLists.txt (+6/-4)
app/music-app.qml (+1/-1)
debian/changelog (+12/-2)
manifest.json.in (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/music-app/content-hub-desktop
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Andrew Hayzen Needs Fixing
Review via email: mp+279333@code.launchpad.net

This proposal has been superseded by a proposal from 2015-12-03.

Commit message

Install the content-hub peer registration json file properly when installing from a deb. Renamed .desktop file when installed from deb.

Description of the change

Install the content-hub peer registration json file properly when installing from a deb. Renamed .desktop file when installed from deb.

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

FAILED: Continuous integration, rev:952
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/14/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/213/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/14/rebuild

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

Thanks for this!

One inline comment so far, also I am about to bump the version in the changelog (as we just had a release) once this is done could you pull and add an entry for yourself in there :-)

review: Needs Fixing
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Also this fails to build with click [0] [1]

And for reference this is the MP with the version bump and release in the changelog etc [2]

0 - http://pastebin.ubuntu.com/13645357/
1 - https://core-apps-jenkins.ubuntu.com/job/music-app-ci/14/console
2 - https://code.launchpad.net/~ahayzen/music-app/release-2.2ubuntu2/+merge/279444

review: Needs Fixing
Revision history for this message
Ken VanDine (ken-vandine) :
lp:~ken-vandine/music-app/content-hub-desktop updated
953. By Ken VanDine

fixed click build

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:953
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/16/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/219/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/16/rebuild

review: Approve (continuous-integration)
lp:~ken-vandine/music-app/content-hub-desktop updated
954. By Ken VanDine

merged release-2.2ubuntu2 branch

955. By Ken VanDine

Install the content-hub json file in the correct place for peer registry

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:955
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/17/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/220/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/17/rebuild

review: Approve (continuous-integration)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2015-08-08 18:32:22 +0000
+++ CMakeLists.txt 2015-12-03 19:59:23 +0000
@@ -38,6 +38,8 @@
38 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)38 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
39 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json39 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json
40 music-app-content.json DESTINATION ${CMAKE_INSTALL_PREFIX})40 music-app-content.json DESTINATION ${CMAKE_INSTALL_PREFIX})
41 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
42 DESTINATION ${DESKTOP_DIR})
41else(CLICK_MODE)43else(CLICK_MODE)
42 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})44 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
43 set(EXEC ${APP_HARDCODE})45 set(EXEC ${APP_HARDCODE})
@@ -48,6 +50,9 @@
48 DESTINATION ${CMAKE_INSTALL_BINDIR})50 DESTINATION ${CMAKE_INSTALL_BINDIR})
49 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)51 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
50 set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)52 set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
53 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
54 DESTINATION ${DESKTOP_DIR} RENAME music-app.desktop)
55 install(FILES music-app-content.json DESTINATION ${CMAKE_INSTALL_DATADIR}/content-hub/peers/ RENAME music-app)
51endif(CLICK_MODE)56endif(CLICK_MODE)
5257
53file(GLOB_RECURSE I18N_SRC_FILES58file(GLOB_RECURSE I18N_SRC_FILES
@@ -60,7 +65,7 @@
6065
61file(GLOB SRC_FILES66file(GLOB SRC_FILES
62 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}67 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
63 *.qml *.js *.png *.js *.json)68 *.qml *.js *.png *.js)
64install(DIRECTORY app DESTINATION ${DATA_DIR})69install(DIRECTORY app DESTINATION ${DATA_DIR})
65install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})70install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
6671
@@ -71,9 +76,6 @@
71 COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE}76 COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE}
72)77)
7378
74install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
75 DESTINATION ${DESKTOP_DIR})
76
77install(FILES ${URLS_FILE} DESTINATION ${URLS_DIR})79install(FILES ${URLS_FILE} DESTINATION ${URLS_DIR})
7880
79# Tests81# Tests
8082
=== modified file 'app/music-app.qml'
--- app/music-app.qml 2015-11-17 01:51:14 +0000
+++ app/music-app.qml 2015-12-03 19:59:23 +0000
@@ -268,7 +268,7 @@
268268
269 // VARIABLES269 // VARIABLES
270 property string musicName: i18n.tr("Music")270 property string musicName: i18n.tr("Music")
271 property string appVersion: '2.2'271 property string appVersion: '2.3'
272 property bool toolbarShown: musicToolbar.visible272 property bool toolbarShown: musicToolbar.visible
273 property bool selectedAlbum: false273 property bool selectedAlbum: false
274 property alias firstRun: startupSettings.firstRun274 property alias firstRun: startupSettings.firstRun
275275
=== modified file 'debian/changelog'
--- debian/changelog 2015-11-17 01:59:57 +0000
+++ debian/changelog 2015-12-03 19:59:23 +0000
@@ -1,4 +1,14 @@
1music-app (2.2ubuntu2) UNRELEASED; urgency=medium1music-app (2.3) UNRELEASED; urgency=medium
2
3 [ Andrew Hayzen ]
4 * Release 2.2ubuntu2 and start on 2.3
5
6 [ Ken VanDine ]
7 * Install the content-hub json file in the correct place for peer registry
8
9 -- Andrew Hayzen <ahayzen@gmail.com> Thu, 03 Dec 2015 14:11:35 +0000
10
11music-app (2.2ubuntu2) vivid; urgency=medium
212
3 [ Bartosz Kosiorek ]13 [ Bartosz Kosiorek ]
4 * Reduce size of images (with tinypng.com) to decrease click size and improve performance14 * Reduce size of images (with tinypng.com) to decrease click size and improve performance
@@ -17,7 +27,7 @@
17 * Switch to using the new uc1.3 listitems within the SDK27 * Switch to using the new uc1.3 listitems within the SDK
18 * Workaround for bug 1514143 by locking the header when searching (LP: #1514143)28 * Workaround for bug 1514143 by locking the header when searching (LP: #1514143)
1929
20 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Tue, 08 Sep 2015 10:08:49 +020030 -- Andrew Hayzen <ahayzen@gmail.com> Thu, 03 Dec 2015 14:10:59 +0000
2131
22music-app (2.2ubuntu1) vivid; urgency=medium32music-app (2.2ubuntu1) vivid; urgency=medium
2333
2434
=== modified file 'manifest.json.in'
--- manifest.json.in 2015-10-18 17:48:14 +0000
+++ manifest.json.in 2015-12-03 19:59:23 +0000
@@ -14,7 +14,7 @@
14 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",14 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
15 "name": "@PROJECT_NAME@",15 "name": "@PROJECT_NAME@",
16 "title": "Music",16 "title": "Music",
17 "version": "2.2.@BZR_REVNO@",17 "version": "2.3.@BZR_REVNO@",
18 "x-source": {18 "x-source": {
19 "vcs-bzr": "@BZR_SOURCE@",19 "vcs-bzr": "@BZR_SOURCE@",
20 "vcs-bzr-revno": "@BZR_REVNO@"20 "vcs-bzr-revno": "@BZR_REVNO@"

Subscribers

People subscribed via source and target branches