← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

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

 


Diff comments:

> === modified file 'CMakeLists.txt'
> --- CMakeLists.txt	2015-08-08 18:32:22 +0000
> +++ CMakeLists.txt	2015-12-02 19:28:55 +0000
> @@ -60,10 +60,12 @@
>  
>  file(GLOB SRC_FILES
>       RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
> -     *.qml *.js *.png *.js *.json)
> +     *.qml *.js *.png *.js)

The json files don't need to be installed with the deb, at least not in the same location as the qml files.  The apparmor file isn't useful in the deb and the content-hub file needs to be installed separately.

>  install(DIRECTORY app DESTINATION ${DATA_DIR})
>  install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
>  
> +install(FILES music-app-content.json DESTINATION ${CMAKE_INSTALL_PREFIX}/share/content-hub/peers/ RENAME music-app)
> +
>  configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
>  
>  add_custom_target(${DESKTOP_FILE} ALL


-- 
https://code.launchpad.net/~ken-vandine/music-app/content-hub-desktop/+merge/279333
Your team Music App Developers is subscribed to branch lp:music-app.