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

[Ken VanDine]

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

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

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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)

[Andrew Hayzen (ahayzen)]

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

[Andrew Hayzen (ahayzen)]

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

[lp:~ken-vandine/music-app/content-hub-desktop]

953. By Ken VanDine on 2015-12-03

fixed click build

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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]

954. By Ken VanDine on 2015-12-03

merged release-2.2ubuntu2 branch

955. By Ken VanDine on 2015-12-03

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

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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

=== 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 @@
     configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json
             music-app-content.json DESTINATION ${CMAKE_INSTALL_PREFIX})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
+        DESTINATION ${DESKTOP_DIR})
 else(CLICK_MODE)
     set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
     set(EXEC ${APP_HARDCODE})
@@ -48,6 +50,9 @@
         DESTINATION ${CMAKE_INSTALL_BINDIR})
     set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
     set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
+        DESTINATION ${DESKTOP_DIR} RENAME music-app.desktop)
+    install(FILES music-app-content.json DESTINATION ${CMAKE_INSTALL_DATADIR}/content-hub/peers/ RENAME music-app)
 endif(CLICK_MODE)
 
 file(GLOB_RECURSE I18N_SRC_FILES
@@ -60,7 +65,7 @@
 
 file(GLOB SRC_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     *.qml *.js *.png *.js *.json)
+     *.qml *.js *.png *.js)
 install(DIRECTORY app DESTINATION ${DATA_DIR})
 install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
 
@@ -71,9 +76,6 @@
     COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE}
 )
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
-    DESTINATION ${DESKTOP_DIR})
-
 install(FILES ${URLS_FILE} DESTINATION ${URLS_DIR})
 
 # Tests

=== 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 @@
 
     // VARIABLES
     property string musicName: i18n.tr("Music")
-    property string appVersion: '2.2'
+    property string appVersion: '2.3'
     property bool toolbarShown: musicToolbar.visible
     property bool selectedAlbum: false
     property alias firstRun: startupSettings.firstRun

=== 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 @@
-music-app (2.2ubuntu2) UNRELEASED; urgency=medium
+music-app (2.3) UNRELEASED; urgency=medium
+
+  [ Andrew Hayzen ]
+  * Release 2.2ubuntu2 and start on 2.3
+
+  [ Ken VanDine ]
+  * Install the content-hub json file in the correct place for peer registry
+
+ -- Andrew Hayzen <[e-mail]>  Thu, 03 Dec 2015 14:11:35 +0000
+
+music-app (2.2ubuntu2) vivid; urgency=medium
 
   [ Bartosz Kosiorek ]
   *  Reduce size of images (with tinypng.com) to decrease click size and improve performance
@@ -17,7 +27,7 @@
   * Switch to using the new uc1.3 listitems within the SDK
   * Workaround for bug 1514143 by locking the header when searching (LP: #1514143)
 
- -- Bartosz Kosiorek <[e-mail]>  Tue, 08 Sep 2015 10:08:49 +0200
+ -- Andrew Hayzen <[e-mail]>  Thu, 03 Dec 2015 14:10:59 +0000
 
 music-app (2.2ubuntu1) vivid; urgency=medium
 

=== 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 @@
     "maintainer": "Ubuntu App Cats <[e-mail]>",
     "name": "@PROJECT_NAME@",
     "title": "Music",
-    "version": "2.2.@BZR_REVNO@",
+    "version": "2.3.@BZR_REVNO@",
     "x-source": {
         "vcs-bzr": "@BZR_SOURCE@",
         "vcs-bzr-revno": "@BZR_REVNO@"