Ubuntu Weather App

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

  1. package-fixes
  2. Merge into trunk
Proposed by Michael Hall
Status: Merged
Approved by: Martin Borho
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 Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
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.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:8
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/3/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-quantal-amd64-ci/3
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-raring-amd64-ci/3

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

review: Approve (continuous-integration)
Revision history for this message
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?

Revision history for this message
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?

Revision history for this message
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
=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf 2013-04-11 20:46:28 +0000
@@ -0,0 +1,2 @@
1[BUILDDEB]
2split = True
03
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2013-04-11 20:46:28 +0000
@@ -0,0 +1,6 @@
1*.qmlproject.user
2
3debian/files
4debian/app-template/
5debian/*.debhelper.log
6debian/*.substvars
07
=== modified file 'debian/compat'
--- debian/compat 2013-02-12 16:18:48 +0000
+++ debian/compat 2013-04-11 20:46:28 +0000
@@ -1,1 +1,1 @@
1819
22
=== modified file 'debian/control'
--- debian/control 2013-02-12 16:27:32 +0000
+++ debian/control 2013-04-11 20:46:28 +0000
@@ -1,18 +1,18 @@
1Source: ubuntu-weather-app1Source: ubuntu-weather-app
2Priority: extra2Priority: extra
3Maintainer: Ugo Riboni <ugo.riboni@canonical.com>3Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
4Build-Depends: debhelper (>= 8.0.0), 4Build-Depends: debhelper (>= 9),
5Standards-Version: 3.9.35Standards-Version: 3.9.4
6Section: misc6Section: misc
7Homepage: https://launchpad.net/ubuntu-weather-app7Homepage: https://launchpad.net/ubuntu-weather-app
8Vcs-Bzr: https://code.launchpad.net/~ubuntu-weather-dev/ubuntu-weather-app/trunk
89
9Package: ubuntu-weather-app10Package: ubuntu-weather-app
10Section: misc11Section: misc
11Architecture: any12Architecture: all
12Depends: ${shlibs:Depends}, ${misc:Depends},13Depends: ${misc:Depends},
13 qmlscene,14 qmlscene,
14 qt-components-ubuntu,15 qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
15 qtdeclarative5-qtquick2-plugin16 qtdeclarative5-qtquick2-plugin
16Description: Weather application17Description: Weather application
17 Core Weather application18 Core Weather application
18
1919
=== modified file 'debian/copyright'
--- debian/copyright 2013-02-12 16:27:32 +0000
+++ debian/copyright 2013-04-11 20:46:28 +0000
@@ -1,16 +1,16 @@
1Format: http://dep.debian.net/deps/dep51Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: ubuntu-weather-app2Upstream-Name: ubuntu-weather-app
3Source:3Source:
44
5Files: *5Files: *
6Copyright: 2013 Canonical Ltd.6Copyright: 2013 Canonical Ltd.
7License: GPL-3.07License: GPL-3
88
9Files: debian/*9Files: debian/*
10Copyright: 2013 Canonical Ltd.10Copyright: 2013 Canonical Ltd.
11License: LGPL-3.011License: LGPL-3
1212
13License: GPL-3.013License: GPL-3
14 This package is free software; you can redistribute it and/or14 This package is free software; you can redistribute it and/or
15 modify it under the terms of the GNU General Public15 modify it under the terms of the GNU General Public
16 License as published by the Free Software Foundation; either16 License as published by the Free Software Foundation; either
@@ -27,7 +27,7 @@
27 On Debian systems, the complete text of the GNU General27 On Debian systems, the complete text of the GNU General
28 Public License can be found in "/usr/share/common-licenses/GPL-3".28 Public License can be found in "/usr/share/common-licenses/GPL-3".
2929
30License: LGPL-3.030License: LGPL-3
31 This package is free software; you can redistribute it and/or31 This package is free software; you can redistribute it and/or
32 modify it under the terms of the GNU Lesser General Public32 modify it under the terms of the GNU Lesser General Public
33 License as published by the Free Software Foundation; either33 License as published by the Free Software Foundation; either
3434
=== removed file 'debian/docs'
=== modified file 'debian/rules'
--- debian/rules 2013-02-12 16:27:32 +0000
+++ debian/rules 2013-04-11 20:46:28 +0000
@@ -1,29 +1,11 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2# -*- makefile -*-2# -*- makefile -*-
3# Sample debian/rules that uses debhelper.
4# This file was originally written by Joey Hess and Craig Small.
5# As a special exception, when this file is copied by dh-make into a
6# dh-make output file, you may use that output file without restriction.
7# This special exception was added by Craig Small in version 0.37 of dh-make.
83
9# Uncomment this to turn on verbose mode.4# Uncomment this to turn on verbose mode.
10#export DH_VERBOSE=15#export DH_VERBOSE=1
116
12# Work-around for some machines where INSTALL_ROOT is not set properly by
13# dh_auto_install
14override_dh_auto_install:
15 dh_auto_install -- INSTALL_ROOT=$(CURDIR)/debian/tmp
16
17# Workaround a bug in that debhelper package version
18override_dh_install:
19 mkdir -p $(CURDIR)/debian/tmp/usr/share/applications/
20 mkdir -p $(CURDIR)/debian/tmp/usr/bin/
21 mkdir -p $(CURDIR)/debian/tmp/usr/share/ubuntu-weather-app/
22 cp ubuntu-weather-app.desktop $(CURDIR)/debian/tmp/usr/share/applications/
23 cp ubuntu-weather-app $(CURDIR)/debian/tmp/usr/bin/
24 cp -r *.qml *.png $(CURDIR)/debian/tmp/usr/share/ubuntu-weather-app/
25
26 dh_install --sourcedir=debian/tmp --fail-missing
27
28%:7%:
29 dh $@8 dh $@
9
10override_dh_install:
11 dh_install --fail-missing
3012
=== modified file 'debian/source/format'
--- debian/source/format 2013-02-12 16:18:48 +0000
+++ debian/source/format 2013-04-11 20:46:28 +0000
@@ -1,1 +1,1 @@
13.0 (native)11.0
22
=== modified file 'debian/ubuntu-weather-app.install'
--- debian/ubuntu-weather-app.install 2013-02-12 16:27:32 +0000
+++ debian/ubuntu-weather-app.install 2013-04-11 20:46:28 +0000
@@ -1,3 +1,7 @@
1usr/share/applications1ubuntu-weather-app usr/bin/
2usr/bin2ubuntu-weather-app.desktop usr/share/applications/
3usr/share/ubuntu-weather-app3*.qml usr/share/ubuntu-weather-app/
4*.png usr/share/ubuntu-weather-app/
5components usr/share/ubuntu-weather-app/
6resources usr/share/ubuntu-weather-app/
7
48
=== modified file 'ubuntu-weather-app'
--- ubuntu-weather-app 2013-02-12 16:27:32 +0000
+++ ubuntu-weather-app 2013-04-11 20:46:28 +0000
@@ -1,2 +1,2 @@
1#!/bin/bash1#!/bin/bash
2qmlscene /usr/share/ubuntu-weather-app/weather.qml2qmlscene /usr/share/ubuntu-weather-app/ubuntu-weather-app.qml
33
=== modified file 'ubuntu-weather-app.desktop'
--- ubuntu-weather-app.desktop 2013-02-12 16:27:32 +0000
+++ ubuntu-weather-app.desktop 2013-04-11 20:46:28 +0000
@@ -3,6 +3,8 @@
3Version=1.03Version=1.0
4Type=Application4Type=Application
5Terminal=false5Terminal=false
6Exec=/usr/bin/ubuntu-weather-app6Exec=qmlscene /usr/share/ubuntu-weather-app/ubuntu-weather-app.qml
7Icon=/usr/share/ubuntu-weather-app/weather64.png7Icon=/usr/share/ubuntu-weather-app/weather64.png
8Name=Weather8Name=Weather
9X-Ubuntu-Touch=true
10X-Ubuntu-StageHint=SideStage
911
=== renamed file 'weather.qml' => 'ubuntu-weather-app.qml'
--- weather.qml 2013-03-28 15:16:05 +0000
+++ ubuntu-weather-app.qml 2013-04-11 20:46:28 +0000
@@ -12,6 +12,7 @@
12MainView {12MainView {
13 // objectName for functional testing purposes (autopilot-qt5)13 // objectName for functional testing purposes (autopilot-qt5)
14 objectName: "weather"14 objectName: "weather"
15 applicationName: "ubuntu-weather-app"
15 16
16 width: units.gu(50)17 width: units.gu(50)
17 height: units.gu(75)18 height: units.gu(75)
1819
=== modified file 'weather64.png'
19Binary files weather64.png 2013-02-12 16:27:32 +0000 and weather64.png 2013-04-11 20:46:28 +0000 differ20Binary 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