Merge lp:~dholbach/ubuntu-weather-app/reboot-packaging-fixes into lp:ubuntu-weather-app

[Daniel Holbach]

Update packaging to reflect reboot changes.

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

FAILED: Continuous integration, rev:10
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dholbach/ubuntu-weather-app/reboot-packaging-fixes/+merge/248528/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/7/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/7

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

review: Needs Fixing (continuous-integration)

[lp:~dholbach/ubuntu-weather-app/reboot-packaging-fixes]

11. By Daniel Holbach on 2015-02-06

empty commit

12. By Daniel Holbach on 2015-02-06

merge from /reboot, resolve conflict

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

PASSED: Continuous integration, rev:12
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/8/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/8

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

LGTM, thanks!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-01-29 08:54:54 +0000
+++ CMakeLists.txt	2015-02-06 15:35:57 +0000
@@ -35,7 +35,6 @@
 set(DESKTOP_FILE "${APP_HARDCODE}.desktop")
 set(ICON [e-mail])
 set(AUTOPILOT_DIR ubuntu_weather_app)
-set(KEY_FILE key.js)
 
 # Set install paths
 if(CLICK_MODE)
@@ -100,8 +99,6 @@
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
         DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
 
-install(FILES ${KEY_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX})
-
 add_subdirectory(app)
 add_subdirectory(backend)
 add_subdirectory(po)

=== renamed file 'key.js' => 'app/data/key.js'
=== modified file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml	2015-02-03 21:26:09 +0000
+++ app/ubuntu-weather-app.qml	2015-02-06 15:35:57 +0000
@@ -21,7 +21,7 @@
 import "components"
 import "data" as Data
 import "data/WeatherApi.js" as WeatherApi
-import "../key.js" as Key
+import "data/key.js" as Key
 import "ui"
 
 MainView {

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-02 15:25:53 +0000
+++ debian/changelog	2015-02-06 15:35:57 +0000
@@ -1,3 +1,9 @@
+ubuntu-weather-app (2.1) UNRELEASED; urgency=medium
+
+  * 
+
+ -- Daniel Holbach <[e-mail]>  Wed, 04 Feb 2015 11:25:02 +0100
+
 ubuntu-weather-app (2.0) utopic; urgency=low
 
   [ Andrew Hayzen ]
@@ -5,7 +11,6 @@
 
  -- Andrew Hayzen <[e-mail]>  Mon, 02 Feb 2014 15:10:00 +0000
 
-
 ubuntu-weather-app (1.8.3ubuntu1) utopic; urgency=low
 
   [ Dan Chapman ]

=== modified file 'debian/control'
--- debian/control	2015-02-02 15:37:49 +0000
+++ debian/control	2015-02-06 15:35:57 +0000
@@ -12,7 +12,7 @@
                qtdeclarative5-dev,
                qtdeclarative5-dev-tools,
                qtdeclarative5-ubuntu-ui-toolkit-plugin,
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Section: misc
 Homepage: https://launchpad.net/ubuntu-weather-app
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-weather-dev/ubuntu-weather-app/trunk
@@ -24,7 +24,6 @@
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          suru-icon-theme | ubuntu-mobile-icons,
-         qtdeclarative5-ubuntuweather-timezone-plugin1.0 (>= ${source:Version}),
          ${misc:Depends}
 Description: Weather application
  Core Weather application

=== added file 'debian/ubuntu-weather-app-autopilot.install'
--- debian/ubuntu-weather-app-autopilot.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-weather-app-autopilot.install	2015-02-06 15:35:57 +0000
@@ -0,0 +1,1 @@
+usr/lib

=== added file 'debian/ubuntu-weather-app.install'
--- debian/ubuntu-weather-app.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-weather-app.install	2015-02-06 15:35:57 +0000
@@ -0,0 +1,1 @@
+usr/share