ubuntu-touch-coreapps-reviewers team mailing list archive

[Ken VanDine <ken.vandine@xxxxxxxxxxxxx>]

Ken VanDine has proposed merging lp:~ken-vandine/music-app/content-hub-desktop into lp:music-app with lp:~ahayzen/music-app/release-2.2ubuntu2 as a prerequisite.

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


Requested reviews:
  Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
  Andrew Hayzen (ahayzen)

For more details, see:
https://code.launchpad.net/~ken-vandine/music-app/content-hub-desktop/+merge/279515

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

-- 
Your team Music App Developers is subscribed to branch lp:music-app.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-08 18:32:22 +0000
+++ CMakeLists.txt	2015-12-03 21:46:25 +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 'debian/changelog'
--- debian/changelog	2015-12-03 21:46:25 +0000
+++ debian/changelog	2015-12-03 21:46:25 +0000
@@ -1,7 +1,11 @@
 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 <ahayzen@xxxxxxxxx>  Thu, 03 Dec 2015 14:11:35 +0000
 
 music-app (2.2ubuntu2) vivid; urgency=medium