Merge lp:~mhall119/ubuntu-weather-app/package-fixes into lp:ubuntu-weather-app/obsolete.trunk

Proposed by Michael Hall on 2013-04-11
Status: Merged
Approved by: Martin Borho on 2013-04-18
Approved revision: 8
Merged at revision: 7
Proposed branch: lp:~mhall119/ubuntu-weather-app/package-fixes
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 186 lines (+37/-40)
11 files modified
.bzr-builddeb/default.conf (+2/-0)
.bzrignore (+6/-0)
debian/compat (+1/-1)
debian/control (+7/-7)
debian/copyright (+5/-5)
debian/rules (+3/-21)
debian/source/format (+1/-1)
debian/ubuntu-weather-app.install (+7/-3)
ubuntu-weather-app (+1/-1)
ubuntu-weather-app.desktop (+3/-1)
ubuntu-weather-app.qml (+1/-0)
To merge this branch: bzr merge lp:~mhall119/ubuntu-weather-app/package-fixes
Reviewer Review Type Date Requested Status
Martin Borho 2013-04-11 Approve on 2013-04-18
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2013-04-11
Review via email: mp+158485@code.launchpad.net

Commit message

Updates packaging and icon for a better install

Description of the change

Updates packaging and icon for a better install

To post a comment you must log in.
G√ľnter Schwann (schwann) wrote :

51 + qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,

Using "qtdeclarative5-ubuntu-ui-toolkit-plugin" is enough. As no one should use the old version by now anymore.

Looking at the .desktop file, the "'ubuntu-weather-app" is not needed anymore, isn't it?

Michael Hall (mhall119) wrote :

According to the SDK developers, we need the "| qt-components-ubuntu" to properly support Quantal and Precise.

I'm not sure what you mean about not needing "ubuntu-weather-app" anymore in the .desktop, can you clarify?

Martin Borho (martin-borho) wrote :

Looks okay for now. Further modifications can be applied later on.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2013-04-11 20:46:28 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== added file '.bzrignore'
10--- .bzrignore 1970-01-01 00:00:00 +0000
11+++ .bzrignore 2013-04-11 20:46:28 +0000
12@@ -0,0 +1,6 @@
13+*.qmlproject.user
14+
15+debian/files
16+debian/app-template/
17+debian/*.debhelper.log
18+debian/*.substvars
19
20=== modified file 'debian/compat'
21--- debian/compat 2013-02-12 16:18:48 +0000
22+++ debian/compat 2013-04-11 20:46:28 +0000
23@@ -1,1 +1,1 @@
24-8
25+9
26
27=== modified file 'debian/control'
28--- debian/control 2013-02-12 16:27:32 +0000
29+++ debian/control 2013-04-11 20:46:28 +0000
30@@ -1,18 +1,18 @@
31 Source: ubuntu-weather-app
32 Priority: extra
33-Maintainer: Ugo Riboni <ugo.riboni@canonical.com>
34-Build-Depends: debhelper (>= 8.0.0),
35-Standards-Version: 3.9.3
36+Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
37+Build-Depends: debhelper (>= 9),
38+Standards-Version: 3.9.4
39 Section: misc
40 Homepage: https://launchpad.net/ubuntu-weather-app
41+Vcs-Bzr: https://code.launchpad.net/~ubuntu-weather-dev/ubuntu-weather-app/trunk
42
43 Package: ubuntu-weather-app
44 Section: misc
45-Architecture: any
46-Depends: ${shlibs:Depends}, ${misc:Depends},
47+Architecture: all
48+Depends: ${misc:Depends},
49 qmlscene,
50- qt-components-ubuntu,
51+ qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
52 qtdeclarative5-qtquick2-plugin
53 Description: Weather application
54 Core Weather application
55-
56
57=== modified file 'debian/copyright'
58--- debian/copyright 2013-02-12 16:27:32 +0000
59+++ debian/copyright 2013-04-11 20:46:28 +0000
60@@ -1,16 +1,16 @@
61-Format: http://dep.debian.net/deps/dep5
62+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
63 Upstream-Name: ubuntu-weather-app
64 Source:
65
66 Files: *
67 Copyright: 2013 Canonical Ltd.
68-License: GPL-3.0
69+License: GPL-3
70
71 Files: debian/*
72 Copyright: 2013 Canonical Ltd.
73-License: LGPL-3.0
74+License: LGPL-3
75
76-License: GPL-3.0
77+License: GPL-3
78 This package is free software; you can redistribute it and/or
79 modify it under the terms of the GNU General Public
80 License as published by the Free Software Foundation; either
81@@ -27,7 +27,7 @@
82 On Debian systems, the complete text of the GNU General
83 Public License can be found in "/usr/share/common-licenses/GPL-3".
84
85-License: LGPL-3.0
86+License: LGPL-3
87 This package is free software; you can redistribute it and/or
88 modify it under the terms of the GNU Lesser General Public
89 License as published by the Free Software Foundation; either
90
91=== removed file 'debian/docs'
92=== modified file 'debian/rules'
93--- debian/rules 2013-02-12 16:27:32 +0000
94+++ debian/rules 2013-04-11 20:46:28 +0000
95@@ -1,29 +1,11 @@
96 #!/usr/bin/make -f
97 # -*- makefile -*-
98-# Sample debian/rules that uses debhelper.
99-# This file was originally written by Joey Hess and Craig Small.
100-# As a special exception, when this file is copied by dh-make into a
101-# dh-make output file, you may use that output file without restriction.
102-# This special exception was added by Craig Small in version 0.37 of dh-make.
103
104 # Uncomment this to turn on verbose mode.
105 #export DH_VERBOSE=1
106
107-# Work-around for some machines where INSTALL_ROOT is not set properly by
108-# dh_auto_install
109-override_dh_auto_install:
110- dh_auto_install -- INSTALL_ROOT=$(CURDIR)/debian/tmp
111-
112-# Workaround a bug in that debhelper package version
113-override_dh_install:
114- mkdir -p $(CURDIR)/debian/tmp/usr/share/applications/
115- mkdir -p $(CURDIR)/debian/tmp/usr/bin/
116- mkdir -p $(CURDIR)/debian/tmp/usr/share/ubuntu-weather-app/
117- cp ubuntu-weather-app.desktop $(CURDIR)/debian/tmp/usr/share/applications/
118- cp ubuntu-weather-app $(CURDIR)/debian/tmp/usr/bin/
119- cp -r *.qml *.png $(CURDIR)/debian/tmp/usr/share/ubuntu-weather-app/
120-
121- dh_install --sourcedir=debian/tmp --fail-missing
122-
123 %:
124 dh $@
125+
126+override_dh_install:
127+ dh_install --fail-missing
128
129=== modified file 'debian/source/format'
130--- debian/source/format 2013-02-12 16:18:48 +0000
131+++ debian/source/format 2013-04-11 20:46:28 +0000
132@@ -1,1 +1,1 @@
133-3.0 (native)
134+1.0
135
136=== modified file 'debian/ubuntu-weather-app.install'
137--- debian/ubuntu-weather-app.install 2013-02-12 16:27:32 +0000
138+++ debian/ubuntu-weather-app.install 2013-04-11 20:46:28 +0000
139@@ -1,3 +1,7 @@
140-usr/share/applications
141-usr/bin
142-usr/share/ubuntu-weather-app
143+ubuntu-weather-app usr/bin/
144+ubuntu-weather-app.desktop usr/share/applications/
145+*.qml usr/share/ubuntu-weather-app/
146+*.png usr/share/ubuntu-weather-app/
147+components usr/share/ubuntu-weather-app/
148+resources usr/share/ubuntu-weather-app/
149+
150
151=== modified file 'ubuntu-weather-app'
152--- ubuntu-weather-app 2013-02-12 16:27:32 +0000
153+++ ubuntu-weather-app 2013-04-11 20:46:28 +0000
154@@ -1,2 +1,2 @@
155 #!/bin/bash
156-qmlscene /usr/share/ubuntu-weather-app/weather.qml
157+qmlscene /usr/share/ubuntu-weather-app/ubuntu-weather-app.qml
158
159=== modified file 'ubuntu-weather-app.desktop'
160--- ubuntu-weather-app.desktop 2013-02-12 16:27:32 +0000
161+++ ubuntu-weather-app.desktop 2013-04-11 20:46:28 +0000
162@@ -3,6 +3,8 @@
163 Version=1.0
164 Type=Application
165 Terminal=false
166-Exec=/usr/bin/ubuntu-weather-app
167+Exec=qmlscene /usr/share/ubuntu-weather-app/ubuntu-weather-app.qml
168 Icon=/usr/share/ubuntu-weather-app/weather64.png
169 Name=Weather
170+X-Ubuntu-Touch=true
171+X-Ubuntu-StageHint=SideStage
172
173=== renamed file 'weather.qml' => 'ubuntu-weather-app.qml'
174--- weather.qml 2013-03-28 15:16:05 +0000
175+++ ubuntu-weather-app.qml 2013-04-11 20:46:28 +0000
176@@ -12,6 +12,7 @@
177 MainView {
178 // objectName for functional testing purposes (autopilot-qt5)
179 objectName: "weather"
180+ applicationName: "ubuntu-weather-app"
181
182 width: units.gu(50)
183 height: units.gu(75)
184
185=== modified file 'weather64.png'
186Binary files weather64.png 2013-02-12 16:27:32 +0000 and weather64.png 2013-04-11 20:46:28 +0000 differ

Subscribers

People subscribed via source and target branches