Bartosz Kosiorek has proposed merging
lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-install-fix into
lp:ubuntu-calculator-app.
Commit message:
Fix of installing calculator on device lp: #1480167
Requested reviews:
Ubuntu Calculator Developers (ubuntu-calculator-dev)
Related bugs:
Bug #1480167 in Ubuntu Calculator App: "Calculator no longer starts"
https://bugs.launchpad.net/ubuntu-calculator-app/+bug/1480167
For more details, see:
https://code.launchpad.net/~gang65/ubuntu-calculator-app/ubuntu-calculator-app-install-fix/+merge/266542
Fix of installing calculator on device lp: #1480167
--
Your team Ubuntu Calculator Developers is requested to review the proposed
merge of lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-install-fix
into lp:ubuntu-calculator-app.
=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt 2015-07-20 19:23:20 +0000
+++ app/CMakeLists.txt 2015-07-31 12:03:09 +0000
@@ -3,14 +3,8 @@
add_custom_target(ubuntu-calculator-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-if(CLICK_MODE)
- install(FILES graphics/${ICON_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX})
- install(FILES ${MAIN_QML} DESTINATION ${CMAKE_INSTALL_PREFIX})
-else (CLICK_MODE)
- install(FILES graphics/${ICON_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR})
- install(FILES ${MAIN_QML} DESTINATION ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR})
-endif(CLICK_MODE)
-
+install(FILES graphics/${ICON_FILE} DESTINATION ${UBUNTU-CALCULATOR-APP_DIR})
+install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-CALCULATOR-APP_DIR})
add_subdirectory(engine)
add_subdirectory(graphics)
=== modified file 'manifest.json.in'
--- manifest.json.in 2015-07-09 20:39:32 +0000
+++ manifest.json.in 2015-07-31 12:03:09 +0000
@@ -4,7 +4,7 @@
"description": "Powerful and easy to use calculator.",
"framework": "ubuntu-sdk-14.10",
"hooks": {
- "@APP_HARDCODE@": {
+ "calculator": {
"apparmor": "@[email protected]",
"desktop": "@CMAKE_INSTALL_DATADIR@/applications/ubuntu-calculator-app.desktop"
}
--
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help : https://help.launchpad.net/ListHelp
