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

Proposed by Victor Thompson on 2015-11-01
Status: Merged
Approved by: Victor Thompson on 2015-11-21
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 🍺🐧🐱 πŸ¦„ 2015-11-01 Approve on 2015-11-07
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-11-01
Jenkins Bot continuous-integration Approve on 2015-11-01
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.
review: Approve (continuous-integration)
review: Approve (continuous-integration)
review: Approve (continuous-integration)

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-08-08 18:27:51 +0000
3+++ CMakeLists.txt 2015-11-01 19:22:32 +0000
4@@ -30,9 +30,9 @@
5
6 set(APP_NAME weather)
7 set(APP_HARDCODE ubuntu-weather-app)
8-set(MAIN_QML ${APP_HARDCODE}.qml)
9+set(MAIN_QML app/${APP_HARDCODE}.qml)
10 set(DESKTOP_FILE "${APP_HARDCODE}.desktop")
11-set(ICON weather-app@30.png)
12+set(ICON app/weather-app@30.png)
13 set(AUTOPILOT_DIR ubuntu_weather_app)
14
15 # Set install paths
16@@ -41,7 +41,9 @@
17 set(UBUNTU-WEATHER_APP_DIR "${CMAKE_INSTALL_DATADIR}/qml")
18
19 set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")
20- set(EXEC "qmlscene $@ ${UBUNTU-WEATHER_APP_DIR}/${MAIN_QML}")
21+ set(EXEC "qmlscene $@ ${MAIN_QML}")
22+ set(DATA_DIR /)
23+
24 set(MODULE_PATH ${QT_IMPORTS_DIR})
25 if(NOT BZR_REVNO)
26 execute_process(
27@@ -56,13 +58,15 @@
28 message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
29 endif(NOT BZR_SOURCE)
30 else(CLICK_MODE)
31- set(UBUNTU-WEATHER_APP_DIR "${CMAKE_INSTALL_DATADIR}/ubuntu-weather-app")
32- execute_process(
33- COMMAND qmake -query QT_INSTALL_QML
34- OUTPUT_VARIABLE QT_IMPORTS_DIR
35- OUTPUT_STRIP_TRAILING_WHITESPACE
36- )
37- set(MODULE_PATH ${QT_IMPORTS_DIR}/WeatherApp)
38+ set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
39+ set(EXEC ${APP_HARDCODE})
40+ set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON})
41+ configure_file(${APP_HARDCODE}.in
42+ ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
43+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
44+ DESTINATION ${CMAKE_INSTALL_BINDIR})
45+ set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
46+ set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
47 endif(CLICK_MODE)
48
49 if(${CLICK_MODE})
50@@ -72,7 +76,6 @@
51 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
52 install(FILES "${APP_HARDCODE}.apparmor" DESTINATION ${CMAKE_INSTALL_PREFIX})
53 else(CLICK_MODE)
54- set(EXEC "qmlscene $@ -I ${MODULE_PATH} ${CMAKE_INSTALL_PREFIX}/${UBUNTU-WEATHER_APP_DIR}/${MAIN_QML}")
55 endif()
56
57
58@@ -81,6 +84,8 @@
59 *.qml *.js)
60 list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h)
61 list(SORT I18N_SRC_FILES)
62+install(DIRECTORY app DESTINATION ${DATA_DIR})
63+install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
64
65 configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
66
67
68=== modified file 'app/CMakeLists.txt'
69--- app/CMakeLists.txt 2015-08-04 03:01:45 +0000
70+++ app/CMakeLists.txt 2015-11-01 19:22:32 +0000
71@@ -4,10 +4,6 @@
72 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
73
74
75-install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
76-
77-install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-WEATHER_APP_DIR})
78-
79 add_subdirectory(components)
80 add_subdirectory(data)
81 add_subdirectory(graphics)
82
83=== renamed file 'debian/ubuntu-weather-app.install' => 'debian/install'
84--- debian/ubuntu-weather-app.install 2015-02-04 10:34:55 +0000
85+++ debian/install 2015-11-01 19:22:32 +0000
86@@ -1,1 +1,2 @@
87-usr/share
88+usr/bin/*
89+usr/share/*
90
91=== modified file 'debian/rules'
92--- debian/rules 2015-02-02 15:25:53 +0000
93+++ debian/rules 2015-11-01 19:22:32 +0000
94@@ -9,6 +9,3 @@
95
96 override_dh_auto_configure:
97 dh_auto_configure -- -DCLICK_MODE=OFF
98-
99-override_dh_install:
100- dh_install --list-missing
101
102=== modified file 'debian/ubuntu-weather-app-autopilot.install'
103--- debian/ubuntu-weather-app-autopilot.install 2015-02-04 10:34:55 +0000
104+++ debian/ubuntu-weather-app-autopilot.install 2015-11-01 19:22:32 +0000
105@@ -1,1 +1,1 @@
106-usr/lib
107+usr/lib/*/dist-packages/ubuntu_weather_app/*
108
109=== added file 'ubuntu-weather-app.in'
110--- ubuntu-weather-app.in 1970-01-01 00:00:00 +0000
111+++ ubuntu-weather-app.in 2015-11-01 19:22:32 +0000
112@@ -0,0 +1,3 @@
113+#!/bin/bash
114+export QT_SELECT=qt5
115+exec qmlscene @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@

Subscribers

People subscribed via source and target branches

to all changes: