ubuntu-touch-coreapps-reviewers team mailing list archive

[Victor Thompson <victor.thompson@xxxxxxxxx>]

Victor Thompson has proposed merging lp:~vthompson/ubuntu-weather-app/reboot-qml-app into lp:ubuntu-weather-app/reboot with lp:~vthompson/ubuntu-weather-app/reboot-location-qml as a prerequisite.

Requested reviews:
  Ubuntu Weather Developers (ubuntu-weather-dev)

For more details, see:
https://code.launchpad.net/~vthompson/ubuntu-weather-app/reboot-qml-app/+merge/259463
-- 
Your team Ubuntu Weather Developers is requested to review the proposed merge of lp:~vthompson/ubuntu-weather-app/reboot-qml-app into lp:ubuntu-weather-app/reboot.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-02-04 10:33:57 +0000
+++ CMakeLists.txt	2015-05-19 03:34:00 +0000
@@ -69,12 +69,6 @@
 if(${CLICK_MODE})
   message("-- Configuring manifest.json")
 
-  execute_process(
-    COMMAND dpkg-architecture -qDEB_HOST_ARCH
-    OUTPUT_VARIABLE CLICK_ARCH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-
   configure_file(${UBUNTU_MANIFEST_PATH} ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
   install(FILES "${APP_HARDCODE}.apparmor" DESTINATION ${CMAKE_INSTALL_PREFIX})

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-01-23 23:15:52 +0000
+++ manifest.json.in	2015-05-19 03:34:00 +0000
@@ -1,7 +1,7 @@
 {
-    "architecture": "@CLICK_ARCH@",
+    "architecture": "all",
     "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",
-    "framework": "ubuntu-sdk-14.10",
+    "framework": "ubuntu-sdk-14.10-qml",
     "hooks": {
         "weather": {
             "apparmor": "ubuntu-weather-app.apparmor",