Merge lp:~vthompson/ubuntu-weather-app/fix-deb-issues into lp:ubuntu-weather-app

[Victor Thompson]

Fixing debian packaging issues

Fixing debian packaging issues

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

PASSED: Continuous integration, rev:160
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/9/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/92/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/9/rebuild

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:160
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/288/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/288

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/288/rebuild

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:160
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/321/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-vivid-amd64-ci/29

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/321/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

LGTM

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-08 18:27:51 +0000
+++ CMakeLists.txt	2015-11-01 19:22:32 +0000
@@ -30,9 +30,9 @@
 
 set(APP_NAME weather)
 set(APP_HARDCODE ubuntu-weather-app)
-set(MAIN_QML ${APP_HARDCODE}.qml)
+set(MAIN_QML app/${APP_HARDCODE}.qml)
 set(DESKTOP_FILE "${APP_HARDCODE}.desktop")
-set(ICON [e-mail])
+set(ICON app/[e-mail])
 set(AUTOPILOT_DIR ubuntu_weather_app)
 
 # Set install paths
@@ -41,7 +41,9 @@
   set(UBUNTU-WEATHER_APP_DIR "${CMAKE_INSTALL_DATADIR}/qml")
 
   set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")
-  set(EXEC "qmlscene $@ ${UBUNTU-WEATHER_APP_DIR}/${MAIN_QML}")
+  set(EXEC "qmlscene $@ ${MAIN_QML}")
+  set(DATA_DIR /)
+
   set(MODULE_PATH ${QT_IMPORTS_DIR})
   if(NOT BZR_REVNO)
     execute_process(
@@ -56,13 +58,15 @@
     message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
   endif(NOT BZR_SOURCE)
 else(CLICK_MODE)
-  set(UBUNTU-WEATHER_APP_DIR "${CMAKE_INSTALL_DATADIR}/ubuntu-weather-app")
-  execute_process(
-    COMMAND qmake -query QT_INSTALL_QML
-            OUTPUT_VARIABLE QT_IMPORTS_DIR
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-  set(MODULE_PATH ${QT_IMPORTS_DIR}/WeatherApp)
+  set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
+  set(EXEC ${APP_HARDCODE})
+  set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON})
+  configure_file(${APP_HARDCODE}.in
+    ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
+  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
+    DESTINATION ${CMAKE_INSTALL_BINDIR})
+  set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
+  set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
 endif(CLICK_MODE)
 
 if(${CLICK_MODE})
@@ -72,7 +76,6 @@
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
   install(FILES "${APP_HARDCODE}.apparmor" DESTINATION ${CMAKE_INSTALL_PREFIX})
 else(CLICK_MODE)
-  set(EXEC "qmlscene $@ -I ${MODULE_PATH}  ${CMAKE_INSTALL_PREFIX}/${UBUNTU-WEATHER_APP_DIR}/${MAIN_QML}")
 endif()
 
 
@@ -81,6 +84,8 @@
     *.qml *.js)
 list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h)
 list(SORT I18N_SRC_FILES)
+install(DIRECTORY app DESTINATION ${DATA_DIR})
+install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
 
 configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
 

=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2015-08-04 03:01:45 +0000
+++ app/CMakeLists.txt	2015-11-01 19:22:32 +0000
@@ -4,10 +4,6 @@
 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 
 
-install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
-
-install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-WEATHER_APP_DIR})
-
 add_subdirectory(components)
 add_subdirectory(data)
 add_subdirectory(graphics)

=== renamed file 'debian/ubuntu-weather-app.install' => 'debian/install'
--- debian/ubuntu-weather-app.install	2015-02-04 10:34:55 +0000
+++ debian/install	2015-11-01 19:22:32 +0000
@@ -1,1 +1,2 @@
-usr/share
+usr/bin/*
+usr/share/*

=== modified file 'debian/rules'
--- debian/rules	2015-02-02 15:25:53 +0000
+++ debian/rules	2015-11-01 19:22:32 +0000
@@ -9,6 +9,3 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DCLICK_MODE=OFF
-
-override_dh_install:
-	dh_install --list-missing

=== modified file 'debian/ubuntu-weather-app-autopilot.install'
--- debian/ubuntu-weather-app-autopilot.install	2015-02-04 10:34:55 +0000
+++ debian/ubuntu-weather-app-autopilot.install	2015-11-01 19:22:32 +0000
@@ -1,1 +1,1 @@
-usr/lib
+usr/lib/*/dist-packages/ubuntu_weather_app/*

=== added file 'ubuntu-weather-app.in'
--- ubuntu-weather-app.in	1970-01-01 00:00:00 +0000
+++ ubuntu-weather-app.in	2015-11-01 19:22:32 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+export QT_SELECT=qt5
+exec qmlscene @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@