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

[Victor Thompson]

* Sync debian version with click version.

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.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:46
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/97/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/67
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/97

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/97/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

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)]

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)]

LGTM :-)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-04 10:25:59 +0000
+++ debian/changelog	2015-06-02 01:19:51 +0000
@@ -1,6 +1,12 @@
+ubuntu-weather-app (3.0) UNRELEASED; urgency=medium
+
+  * Sync debian version with click version.
+
+ -- Victor Thompson <[e-mail]>  Mon, 01 Jun 2015 20:11:23 -0500
+
 ubuntu-weather-app (2.1) UNRELEASED; urgency=medium
 
-  * 
+  * Update packaging to reflect reboot changes.
 
  -- Daniel Holbach <[e-mail]>  Wed, 04 Feb 2015 11:25:02 +0100