Ubuntu Weather App

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

  1. fix-deb-issues
  2. Merge into reboot
Proposed by Victor Thompson
Status: Merged
Approved by: Victor Thompson
Approved revision: 160
Merged at revision: 176
Proposed branch: lp:~vthompson/ubuntu-weather-app/fix-deb-issues
Merge into: lp:ubuntu-weather-app
Diff against target: 115 lines (+22/-20)
6 files modified
CMakeLists.txt (+16/-11)
app/CMakeLists.txt (+0/-4)
debian/install (+2/-1)
debian/rules (+0/-3)
debian/ubuntu-weather-app-autopilot.install (+1/-1)
ubuntu-weather-app.in (+3/-0)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/fix-deb-issues
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+276350@code.launchpad.net

Commit message

Fixing debian packaging issues

Description of the change

Fixing debian packaging issues

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
3030
31set(APP_NAME weather)31set(APP_NAME weather)
32set(APP_HARDCODE ubuntu-weather-app)32set(APP_HARDCODE ubuntu-weather-app)
33set(MAIN_QML ${APP_HARDCODE}.qml)33set(MAIN_QML app/${APP_HARDCODE}.qml)
34set(DESKTOP_FILE "${APP_HARDCODE}.desktop")34set(DESKTOP_FILE "${APP_HARDCODE}.desktop")
35set(ICON weather-app@30.png)35set(ICON app/weather-app@30.png)
36set(AUTOPILOT_DIR ubuntu_weather_app)36set(AUTOPILOT_DIR ubuntu_weather_app)
3737
38# Set install paths38# Set install paths
@@ -41,7 +41,9 @@
41 set(UBUNTU-WEATHER_APP_DIR "${CMAKE_INSTALL_DATADIR}/qml")41 set(UBUNTU-WEATHER_APP_DIR "${CMAKE_INSTALL_DATADIR}/qml")
4242
43 set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")43 set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")
44 set(EXEC "qmlscene $@ ${UBUNTU-WEATHER_APP_DIR}/${MAIN_QML}")44 set(EXEC "qmlscene $@ ${MAIN_QML}")
45 set(DATA_DIR /)
46
45 set(MODULE_PATH ${QT_IMPORTS_DIR})47 set(MODULE_PATH ${QT_IMPORTS_DIR})
46 if(NOT BZR_REVNO)48 if(NOT BZR_REVNO)
47 execute_process(49 execute_process(
@@ -56,13 +58,15 @@
56 message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")58 message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
57 endif(NOT BZR_SOURCE)59 endif(NOT BZR_SOURCE)
58else(CLICK_MODE)60else(CLICK_MODE)
59 set(UBUNTU-WEATHER_APP_DIR "${CMAKE_INSTALL_DATADIR}/ubuntu-weather-app")61 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
60 execute_process(62 set(EXEC ${APP_HARDCODE})
61 COMMAND qmake -query QT_INSTALL_QML63 set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON})
62 OUTPUT_VARIABLE QT_IMPORTS_DIR64 configure_file(${APP_HARDCODE}.in
63 OUTPUT_STRIP_TRAILING_WHITESPACE65 ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
64 )66 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
65 set(MODULE_PATH ${QT_IMPORTS_DIR}/WeatherApp)67 DESTINATION ${CMAKE_INSTALL_BINDIR})
68 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
69 set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
66endif(CLICK_MODE)70endif(CLICK_MODE)
6771
68if(${CLICK_MODE})72if(${CLICK_MODE})
@@ -72,7 +76,6 @@
72 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})76 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
73 install(FILES "${APP_HARDCODE}.apparmor" DESTINATION ${CMAKE_INSTALL_PREFIX})77 install(FILES "${APP_HARDCODE}.apparmor" DESTINATION ${CMAKE_INSTALL_PREFIX})
74else(CLICK_MODE)78else(CLICK_MODE)
75 set(EXEC "qmlscene $@ -I ${MODULE_PATH} ${CMAKE_INSTALL_PREFIX}/${UBUNTU-WEATHER_APP_DIR}/${MAIN_QML}")
76endif()79endif()
7780
7881
@@ -81,6 +84,8 @@
81 *.qml *.js)84 *.qml *.js)
82list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h)85list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h)
83list(SORT I18N_SRC_FILES)86list(SORT I18N_SRC_FILES)
87install(DIRECTORY app DESTINATION ${DATA_DIR})
88install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
8489
85configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)90configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
8691
8792
=== 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 @@
4endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")4endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
55
66
7install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
8
9install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-WEATHER_APP_DIR})
10
11add_subdirectory(components)7add_subdirectory(components)
12add_subdirectory(data)8add_subdirectory(data)
13add_subdirectory(graphics)9add_subdirectory(graphics)
1410
=== 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 @@
1usr/share1usr/bin/*
2usr/share/*
23
=== 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 @@
99
10override_dh_auto_configure:10override_dh_auto_configure:
11 dh_auto_configure -- -DCLICK_MODE=OFF11 dh_auto_configure -- -DCLICK_MODE=OFF
12
13override_dh_install:
14 dh_install --list-missing
1512
=== 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 @@
1usr/lib1usr/lib/*/dist-packages/ubuntu_weather_app/*
22
=== 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 @@
1#!/bin/bash
2export QT_SELECT=qt5
3exec qmlscene @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@

Subscribers

People subscribed via source and target branches

to all changes: