Merge lp:~vthompson/ubuntu-weather-app/reboot-match-click-debian-version-numbers into lp:ubuntu-weather-app

Proposed by Victor Thompson on 2015-06-02
Status: Merged
Approved by: Andrew Hayzen on 2015-06-13
Approved revision: 46
Merged at revision: 50
Proposed branch: lp:~vthompson/ubuntu-weather-app/reboot-match-click-debian-version-numbers
Merge into: lp:ubuntu-weather-app
Diff against target: 16 lines (+7/-1)
1 file modified
debian/changelog (+7/-1)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/reboot-match-click-debian-version-numbers
Reviewer Review Type Date Requested Status
Andrew Hayzen 2015-06-02 Approve on 2015-06-13
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-06-02
Review via email: mp+260780@code.launchpad.net

Commit Message

* Sync debian version with click version.

Description of the Change

Current, the debian version being built for a PPA is version 2.1, whereas the click package version is 3.0. This incongruency also exists in trunk, however, it should be replaced with the reboot series soon. The core apps PPA is actually building from the reboot series rather than trunk due to the higher revision number (one would assume) anyway.

To post a comment you must log in.

Seems there's an issue with the debian config, unrelated to this change, but the deb errors here:-

E: ubuntu-weather-app source: source-is-missing app/data/CitiesList.js

Victor Thompson (vthompson) wrote :

I see the same error, however, the file is in the generated deb file:

dpkg -c ../ubuntu-weather-app_3.0_all.deb | grep CitiesList.js
-rw-r--r-- root/root 15504 2015-06-01 20:05 ./usr/share/ubuntu-weather-app/data/CitiesList.js

Here's the lintian output: http://paste.ubuntu.com/11520239/

I'm not sure why it would only complain about that JS file and not any of the others in that directory.

Andrew Hayzen (ahayzen) wrote :

LGTM :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-02-04 10:25:59 +0000
3+++ debian/changelog 2015-06-02 01:19:51 +0000
4@@ -1,6 +1,12 @@
5+ubuntu-weather-app (3.0) UNRELEASED; urgency=medium
6+
7+ * Sync debian version with click version.
8+
9+ -- Victor Thompson <victor.thompson@gmail.com> Mon, 01 Jun 2015 20:11:23 -0500
10+
11 ubuntu-weather-app (2.1) UNRELEASED; urgency=medium
12
13- *
14+ * Update packaging to reflect reboot changes.
15
16 -- Daniel Holbach <daniel.holbach@ubuntu.com> Wed, 04 Feb 2015 11:25:02 +0100
17

Subscribers

People subscribed via source and target branches

to all changes: