Merge lp:~martin-borho/ubuntu-weather-app/reboot-real-weather-data into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

Filled static prototype components with real weather data.

Filled static prototype components with real weather data.

[lp:~martin-borho/ubuntu-weather-app/reboot-real-weather-data]

7. By Martin Borho on 2015-02-08

Filled static prototype components with real weather data.

Approved by Victor Thompson, Ubuntu Phone Apps Jenkins Bot.

8. By Andrew Hayzen on 2015-02-09

* Add bottom edge page listing the locations.

Approved by Victor Thompson, Ubuntu Phone Apps Jenkins Bot.

9. By Andrew Hayzen on 2015-02-12

* Use Settings API, with migration of data - deletion of old data not enabled yet.

Approved by Victor Thompson, Ubuntu Phone Apps Jenkins Bot.

10. By Andrew Hayzen on 2015-02-12

* Basic implementation of settings for Units, DataProvider and RefreshInterval. Fixes: https://bugs.launchpad.net/bugs/1420609.

Approved by Victor Thompson, Ubuntu Phone Apps Jenkins Bot.

11. By Martin Borho on 2015-02-14

Put locations in a Listview and all in a Flickable

12. By Martin Borho on 2015-02-15

removed snapMode for LocatioonPanes due to error

13. By Martin Borho on 2015-02-15

minor comments changes

14. By Martin Borho on 2015-02-15

added current property to settings

15. By Martin Borho on 2015-02-15

removed highlightMoveDuration

16. By Martin Borho on 2015-02-15

currentIndex gets set from settings.current

17. By Martin Borho on 2015-02-15

formatting

18. By Martin Borho on 2015-02-15

pushing HomePage.qml directly to pagestack

Unmerged revisions

18. By Martin Borho on 2015-02-15

pushing HomePage.qml directly to pagestack

17. By Martin Borho on 2015-02-15

formatting

16. By Martin Borho on 2015-02-15

currentIndex gets set from settings.current

15. By Martin Borho on 2015-02-15

removed highlightMoveDuration

14. By Martin Borho on 2015-02-15

added current property to settings

13. By Martin Borho on 2015-02-15

minor comments changes

12. By Martin Borho on 2015-02-15

removed snapMode for LocatioonPanes due to error

11. By Martin Borho on 2015-02-14

Put locations in a Listview and all in a Flickable

10. By Andrew Hayzen on 2015-02-12

* Basic implementation of settings for Units, DataProvider and RefreshInterval. Fixes: https://bugs.launchpad.net/bugs/1420609.

Approved by Victor Thompson, Ubuntu Phone Apps Jenkins Bot.

9. By Andrew Hayzen on 2015-02-12

* Use Settings API, with migration of data - deletion of old data not enabled yet.

Approved by Victor Thompson, Ubuntu Phone Apps Jenkins Bot.

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2015-02-07 17:39:34 +0000
@@ -0,0 +1,19 @@
+*.user*
+debian/files
+debian/tmp
+debian/ubuntu-weather-app*
+debian/app-template/
+debian/*.debhelper.log
+debian/*.substvars
+.build
+Makefile
+CMakeCache.txt
+CMakeFiles/
+*.cmake
+*.gmo
+*.mo
+*.desktop
+*.desktop.in
+*.desktop.in.in.h
+.excludes
+ubuntu-weather-app.json

=== renamed file '.bzrignore' => '.bzrignore.moved'
=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2015-02-07 17:39:34 +0000
@@ -0,0 +1,108 @@
+project(com.ubuntu.weather)
+cmake_minimum_required(VERSION 2.8.9)
+
+find_program(INTLTOOL_MERGE intltool-merge)
+if(NOT INTLTOOL_MERGE)
+    message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package")
+endif()
+find_program(INTLTOOL_EXTRACT intltool-extract)
+if(NOT INTLTOOL_EXTRACT)
+    message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
+endif()
+
+set (UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Qml REQUIRED)
+find_package(Qt5Quick REQUIRED)
+
+# Automatically create moc files
+set(CMAKE_AUTOMOC ON)
+
+option(INSTALL_TESTS "Install the tests on make install" on)
+option(CLICK_MODE "Build as a click package" on)
+
+# Tests
+enable_testing()
+
+# Standard install paths
+include(GNUInstallDirs)
+
+set(APP_NAME weather)
+set(APP_HARDCODE ubuntu-weather-app)
+set(MAIN_QML ${APP_HARDCODE}.qml)
+set(DESKTOP_FILE "${APP_HARDCODE}.desktop")
+set(ICON [e-mail])
+set(AUTOPILOT_DIR ubuntu_weather_app)
+
+# Set install paths
+if(CLICK_MODE)
+  set(CMAKE_INSTALL_PREFIX "/")
+  set(UBUNTU-WEATHER_APP_DIR "${CMAKE_INSTALL_DATADIR}/qml")
+
+  set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")
+  set(EXEC "qmlscene $@ ${UBUNTU-WEATHER_APP_DIR}/${MAIN_QML}")
+  set(MODULE_PATH ${QT_IMPORTS_DIR})
+  if(NOT BZR_REVNO)
+    execute_process(
+      COMMAND bzr revno
+              OUTPUT_VARIABLE BZR_REVNO
+              WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+              OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+  endif(NOT BZR_REVNO)
+  if(NOT BZR_SOURCE)
+    set(BZR_SOURCE "lp:${APP_HARDCODE}/reboot")
+    message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
+  endif(NOT BZR_SOURCE)
+else(CLICK_MODE)
+  set(UBUNTU-WEATHER_APP_DIR "${CMAKE_INSTALL_DATADIR}/ubuntu-weather-app")
+  execute_process(
+    COMMAND qmake -query QT_INSTALL_QML
+            OUTPUT_VARIABLE QT_IMPORTS_DIR
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+  set(MODULE_PATH ${QT_IMPORTS_DIR}/WeatherApp)
+endif(CLICK_MODE)
+
+if(${CLICK_MODE})
+  message("-- Configuring manifest.json")
+
+  execute_process(
+    COMMAND dpkg-architecture -qDEB_HOST_ARCH
+    OUTPUT_VARIABLE CLICK_ARCH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+
+  configure_file(${UBUNTU_MANIFEST_PATH} ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
+  install(FILES "${APP_HARDCODE}.apparmor" DESTINATION ${CMAKE_INSTALL_PREFIX})
+else(CLICK_MODE)
+  set(EXEC "qmlscene $@ -I ${MODULE_PATH}  ${CMAKE_INSTALL_PREFIX}/${UBUNTU-WEATHER_APP_DIR}/${MAIN_QML}")
+endif()
+
+
+file(GLOB_RECURSE I18N_SRC_FILES
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
+    *.qml *.js)
+list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h)
+list(SORT I18N_SRC_FILES)
+
+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
+
+add_custom_target(${DESKTOP_FILE} ALL
+    COMMENT "Merging translations into ${DESKTOP_FILE}..."
+    COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE}
+)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+
+add_subdirectory(app)
+add_subdirectory(backend)
+add_subdirectory(po)
+add_subdirectory(tests)
+
+# TODO: Add custom target for autopilot and run.
+

=== renamed file 'CMakeLists.txt' => 'CMakeLists.txt.moved'
=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2015-02-07 17:39:34 +0000
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

=== renamed file 'COPYING' => 'COPYING.moved'
=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2015-02-07 17:39:34 +0000
@@ -0,0 +1,11 @@
+Weather app for Ubuntu devices
+
+To contribute:
+    https://wiki.ubuntu.com/Touch/CoreApps/Weather
+    https://wiki.ubuntu.com/Touch/CoreApps/DevelopmentGuide
+
+The following essential packages are required to develop this app:
+- ubuntu-sdk (see http://developer.ubuntu.com/start)
+- intltool - run the `sudo apt-get install intltool` command for installation
+
+See the debian/control file for an up-to-date list of dependencies

=== renamed file 'README' => 'README.moved'
=== added file 'README.translations'
--- README.translations	1970-01-01 00:00:00 +0000
+++ README.translations	2015-02-07 17:39:34 +0000
@@ -0,0 +1,40 @@
+# Updating translations
+
+Translations for the Weather app happen in [Launchpad Translations][] and
+are automatically committed daily on the trunk branch in the po/ folder.
+
+They are then built and installed as part of the package build, so that
+developers don't really need to worry about them.
+
+However, there is one task that needs to be taken care of: exposing new
+translatable messages to translators. So whenever you add new translatable
+messages in the code, make sure to follow these steps:
+
+ 1. Run click-buddy retaining the build directory:
+    `click-buddy --dir . --no-clean`
+ 2. Copy the .pot file from the <build dir> mentioned in the output to your
+    original source:
+    `cp <build dir>/po/*.pot po/`
+ 3. Commit the generated .pot file:
+    `bzr commit -m"Updated translation template"`
+ 4. Push the branch and send a merge proposal as usual
+
+And that's it, once the branch lands Launchpad should take care of all the rest!
+
+# Behind the scenes
+
+Behind the scenes, whenever the po/*.pot file (also known as translations template)
+is committed to trunk Launchpad reads it and updates the translatable strings
+exposed in the web UI. This will enable translators to work on the new strings.
+The translations template contains all translatable strings that have been
+extracted from the source code files.
+
+Launchpad will then store translations in its database and will commit them daily
+in the form of textual po/*.po files to trunk. The PO files are also usually
+referred to as the translations files. You'll find a translation file for each
+language the app has got at least a translated message available for.
+
+Translations for core apps follow the standard [gettext format].
+
+ [Launchpad Translations]: https://translations.launchpad.net/ubuntu-weather-app
+ [gettext format]: https://www.gnu.org/software/gettext/

=== renamed file 'README.translations' => 'README.translations.moved'
=== added directory 'app'
=== added file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/CMakeLists.txt	2015-02-07 17:39:34 +0000
@@ -0,0 +1,17 @@
+if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+  file(GLOB QML_JS_FILES *.qml *.js)
+  add_custom_target(ubuntu-weather-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
+endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+
+
+if(CLICK_MODE)
+  set(ICON ${ICON})
+  install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
+endif(CLICK_MODE)
+
+install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-WEATHER_APP_DIR})
+
+add_subdirectory(components)
+add_subdirectory(data)
+add_subdirectory(ui)
+

=== added directory 'app/components'
=== added file 'app/components/CMakeLists.txt'
--- app/components/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/components/CMakeLists.txt	2015-02-07 17:39:34 +0000
@@ -0,0 +1,5 @@
+file(GLOB COMPONENTS_QML_JS_FILES *.qml *.js)
+
+add_custom_target(ubuntu-weather-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
+
+install(FILES ${COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-WEATHER_APP_DIR}/components)

=== added file 'app/components/DayDelegate.qml'
--- app/components/DayDelegate.qml	1970-01-01 00:00:00 +0000
+++ app/components/DayDelegate.qml	2015-02-07 17:39:34 +0000
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This file is part of Ubuntu Weather App
+ *
+ * Ubuntu Weather App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Weather App is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+ListItem.Standard {
+    height: units.gu(8)
+
+    // TODO: will expand when clicked to reveal more info
+
+    property alias day: dayLabel.text
+    property alias image: weatherImage.source
+    property alias high: highLabel.text
+    property alias low: lowLabel.text
+
+    // Standard divider is not full width so add a ThinDivider to the bottom
+    showDivider: false
+
+    ListItem.ThinDivider {
+        anchors {
+            bottom: parent.bottom
+        }
+    }
+
+    Label {
+        id: dayLabel
+        anchors {
+            left: parent.left
+            right: weatherImage.left
+            rightMargin: units.gu(1)
+            verticalCenter: parent.verticalCenter
+        }
+        elide: Text.ElideRight
+        font.weight: Font.Light
+        fontSize: "medium"
+    }
+
+    Image {
+        id: weatherImage
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            verticalCenter: parent.verticalCenter
+        }
+        height: units.gu(3)
+        width: units.gu(3)
+
+        Rectangle {
+            anchors {
+                fill: parent
+            }
+            color: "#F00"
+
+            Label {
+                anchors {
+                    centerIn: parent
+                }
+                text: "img"
+            }
+        }
+    }
+
+    Label {
+        id: lowLabel
+        anchors {
+            left: weatherImage.right
+            right: highLabel.left
+            rightMargin: units.gu(1)
+            verticalCenter: parent.verticalCenter
+        }
+        elide: Text.ElideRight
+        font.pixelSize: units.gu(2)
+        font.weight: Font.Light
+        fontSize: "medium"
+        height: units.gu(2)
+        horizontalAlignment: Text.AlignRight
+        verticalAlignment: Text.AlignTop  // AlignTop appears to align bottom?
+    }
+
+    Label {
+        id: highLabel
+        anchors {
+            bottom: lowLabel.bottom
+            right: parent.right
+        }
+        color: UbuntuColors.orange
+        elide: Text.ElideRight
+        font.pixelSize: units.gu(3)
+        font.weight: Font.Normal
+        height: units.gu(3)
+        verticalAlignment: Text.AlignTop  // AlignTop appears to align bottom?
+    }
+}

=== added file 'app/components/HeaderRow.qml'
--- app/components/HeaderRow.qml	1970-01-01 00:00:00 +0000
+++ app/components/HeaderRow.qml	2015-02-07 17:39:34 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This file is part of Ubuntu Weather App
+ *
+ * Ubuntu Weather App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Weather App is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+
+
+Row {
+    spacing: units.gu(2)
+    width: parent.width
+
+    property alias locationName: locationNameLabel.text
+
+    Label {
+        id: locationNameLabel
+        color: UbuntuColors.darkGrey
+        elide: Text.ElideRight
+        font.weight: Font.Normal
+        fontSize: "large"
+        height: settingsButton.height
+        width: parent.width - settingsButton.width - parent.spacing
+        verticalAlignment: Text.AlignVCenter
+    }
+
+    AbstractButton {
+        id: settingsButton
+        height: width
+        width: units.gu(4)
+
+        Rectangle {
+            anchors {
+                fill: parent
+            }
+            color: Theme.palette.selected.background
+            visible: parent.pressed
+        }
+
+        Icon {
+            anchors {
+                centerIn: parent
+            }
+            color: UbuntuColors.darkGrey
+            name: "settings"
+            height: width
+            width: units.gu(2.5)
+        }
+    }
+}

=== added file 'app/components/HomeGraphic.qml'
--- app/components/HomeGraphic.qml	1970-01-01 00:00:00 +0000
+++ app/components/HomeGraphic.qml	2015-02-07 17:39:34 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This file is part of Ubuntu Weather App
+ *
+ * Ubuntu Weather App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Weather App is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+
+Item {
+    height: units.gu(32)
+    width: parent.width
+
+    property alias icon: iconLabel.text
+
+    // TODO: will be on 'rails' (horizontal listview?) to reveal hourly forecast
+    Image {
+        anchors {
+            fill: parent
+        }
+
+        Rectangle {
+            anchors {
+                fill: parent
+            }
+            color: "#F00"
+
+            Label {
+                id: iconLabel
+                anchors {
+                    centerIn: parent
+                }
+            }
+        }
+    }
+}
+

=== added file 'app/components/HomeTempInfo.qml'
--- app/components/HomeTempInfo.qml	1970-01-01 00:00:00 +0000
+++ app/components/HomeTempInfo.qml	2015-02-07 17:39:34 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This file is part of Ubuntu Weather App
+ *
+ * Ubuntu Weather App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Weather App is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+
+
+Column {
+    anchors {
+        left: parent.left
+        right: parent.right
+    }
+    spacing: units.gu(1)
+
+    property alias description: descriptionLabel.text
+    property alias high: highLabel.text
+    property alias low: lowLabel.text
+    property alias now: nowLabel.text
+
+    Label {
+        font.weight: Font.Light
+        fontSize: "small"
+        text: i18n.tr("Today")
+    }
+
+    Label {
+        id: descriptionLabel
+        font.weight: Font.Normal
+        fontSize: "large"
+    }
+
+    Row {
+        spacing: units.gu(2)
+
+        Label {
+            id: nowLabel
+            color: UbuntuColors.orange
+            font.pixelSize: units.gu(8)
+            font.weight: Font.Light
+            height: units.gu(8)
+            verticalAlignment: Text.AlignBottom  // AlignBottom seems to put it at the top?
+        }
+
+        Column {
+            Label {
+                id: lowLabel
+                font.weight: Font.Light
+                fontSize: "medium"
+            }
+
+            Label {
+                id: highLabel
+                font.weight: Font.Light
+                fontSize: "medium"
+            }
+        }
+    }
+}

=== added directory 'app/data'
=== added file 'app/data/CMakeLists.txt'
--- app/data/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/data/CMakeLists.txt	2015-02-07 17:39:34 +0000
@@ -0,0 +1,5 @@
+file(GLOB DATA_QML_JS_FILES *.qml *.js)
+
+add_custom_target(ubuntu-weather-app_data_QMlFiles ALL SOURCES ${DATA_QML_JS_FILES})
+
+install(FILES ${DATA_QML_JS_FILES} DESTINATION ${UBUNTU-WEATHER_APP_DIR}/data)

=== added file 'app/data/Storage.qml'
--- app/data/Storage.qml	1970-01-01 00:00:00 +0000
+++ app/data/Storage.qml	2015-02-07 17:39:34 +0000
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2013, 2014, 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Martin Borho <[e-mail]>
+ */
+import QtQuick.LocalStorage 2.0
+import QtQuick 2.3
+
+Item {
+    property var db: null
+
+    function openDB() {
+        if(db !== null) return;
+
+        db = LocalStorage.openDatabaseSync("com.ubuntu.weather", "", "Default Ubuntu weather app", 100000);
+
+        if (db.version === "") {
+            db.changeVersion("", "0.1",
+                function(tx) {
+                    tx.executeSql('CREATE TABLE IF NOT EXISTS Locations(id INTEGER PRIMARY KEY AUTOINCREMENT, data TEXT, date TEXT)');
+                    console.log('Database created');
+                });
+            // reopen database with new version number
+            db = LocalStorage.openDatabaseSync("com.ubuntu.weather", "", "Default Ubuntu weather app", 100000);
+        }
+
+        if(db.version === "0.1") {
+            db.changeVersion("0.1", "0.2",
+                function(tx) {
+                    tx.executeSql('CREATE TABLE IF NOT EXISTS settings(key TEXT UNIQUE, value TEXT)');
+                    console.log('Settings table added, Database upgraded to v0.2');
+                });
+            // reopen database with new version number
+            db = LocalStorage.openDatabaseSync("com.ubuntu.weather", "", "Default Ubuntu weather app", 100000);
+        }
+
+        if(db.version === "0.2") {
+            db.changeVersion("0.2", "0.3",
+                function(tx) {
+                    tx.executeSql('DELETE FROM Locations WHERE 1');
+                    console.log('Removed old locations, Database upgraded to v0.3');
+                });
+        }
+    }
+
+    function saveSetting(key, value) {
+        openDB();
+        db.transaction( function(tx){
+            tx.executeSql('INSERT OR REPLACE INTO settings VALUES(?, ?)', [key, value]);
+        });
+    }
+
+    function getSettings(callback) {
+        openDB();
+        var settings = {};
+        db.readTransaction(
+            function(tx){
+                var rs = tx.executeSql('SELECT key, value FROM Settings');
+                for(var i = 0; i < rs.rows.length; i++) {
+                    var row = rs.rows.item(i);
+                    settings[row.key] = row.value;
+                }
+                callback(settings);
+            }
+        );
+    }
+
+    function clearSetting(name) {
+        openDB();
+        db.transaction(function(tx){
+            tx.executeSql('DELETE FROM Settings WHERE key = ?', [name]);
+        });
+    }
+
+    function insertLocation(data) {
+        openDB();
+        var res;
+        db.transaction( function(tx){
+            var r = tx.executeSql('INSERT INTO Locations(data, date) VALUES(?, ?)', [JSON.stringify(data), new Date().getTime()]);
+            res = r.insertId;
+        });
+        return res;
+    }
+
+    function updateLocation(dbId, data) {
+        openDB();
+        db.transaction( function(tx){
+            var r = tx.executeSql('UPDATE Locations SET data = ?, date=? WHERE id = ?', [JSON.stringify(data), new Date().getTime(), dbId])
+        });
+    }
+
+    function getLocations(callback) {
+        openDB();
+        db.readTransaction(
+            function(tx){
+                var locations = [];
+                var rs = tx.executeSql('SELECT * FROM Locations');
+                for(var i = 0; i < rs.rows.length; i++) {
+                    var row = rs.rows.item(i),
+                        locData = JSON.parse(row.data);
+                    locData["updated"] = parseInt(row.date, 10);
+                    locData["db"] = {id: row.id, updated: new Date(parseInt(row.date, 10))};
+                    locations.push(locData);
+                }
+                callback(locations);
+            }
+        );
+    }
+
+    function clearLocation(location_id) {
+        openDB();
+        db.transaction(function(tx){
+            tx.executeSql('DELETE FROM Locations WHERE id = ?', [location_id]);
+        });
+    }
+
+    function clearDB() { // for dev purposes
+        openDB();
+        db.transaction(function(tx){
+            tx.executeSql('DELETE FROM Locations WHERE 1');
+            tx.executeSql('DELETE FROM Settings WHERE 1');
+        });
+    }
+}

=== added file 'app/data/WeatherApi.js'
--- app/data/WeatherApi.js	1970-01-01 00:00:00 +0000
+++ app/data/WeatherApi.js	2015-02-07 17:39:34 +0000
@@ -0,0 +1,743 @@
+.pragma library
+/*
+ * Copyright (C) 2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Raúl Yeguas <[e-mail]>
+ *              Martin Borho <[e-mail]>
+ *              Andrew Starr-Bochicchio <[e-mail]>
+ */
+
+/**
+*  Version of the response data format.
+*  Increase this number to force a refresh.
+*/
+var RESPONSE_DATA_VERSION = 20140315;
+
+/**
+* Helper functions
+*/
+function debug(obj) {
+    print(JSON.stringify(obj))
+}
+//
+function calcFahrenheit(celsius) {
+        return celsius * 1.8 + 32;
+}
+//
+function calcMph(ms) {
+    return ms*2.24;
+}
+//
+function calcInch(mm) {
+    return mm/25.4;
+}
+//
+function calcKmh(ms) {
+    return ms*3.6;
+}
+//
+function convertKmhToMph(kmh) {
+    return kmh*0.621;
+}
+//
+function calcWindDir(degrees) {
+    var direction =  "?";
+    if(degrees >=0 && degrees <= 30){
+        direction = "N";
+    } else if(degrees >30 && degrees <= 60){
+        direction = "NE";
+    } else if(degrees >60 && degrees <= 120){
+        direction = "E";
+    } else if(degrees >120 && degrees <= 150){
+        direction = "SE";
+    } else if(degrees >150 && degrees <= 210){
+        direction = "S";
+    } else if(degrees >210 && degrees <= 240){
+        direction = "SW";
+    } else if(degrees >240 && degrees <= 300){
+        direction = "W";
+    } else if(degrees >300 && degrees <= 330){
+        direction = "NW";
+    } else if(degrees >330 && degrees <= 360){
+        direction = "N";
+    }
+    return direction;
+}
+
+//
+function getLocationTime(tstamp) {
+    var locTime = new Date(tstamp);
+    return {
+        year: locTime.getUTCFullYear(),
+        month: locTime.getUTCMonth(),
+        date: locTime.getUTCDate(),
+        hours: locTime.getUTCHours(),
+        minutes: locTime.getUTCMinutes()
+    }
+}
+// Serialize a JavaScript object to URL parameters
+// E.g. {param1: value1, param2: value2} to "param1=value&param2=value"
+// TODO: it'd be nice to make it work with either passing a single object
+// or several at once
+function parameterize(obj) {
+  var str = [];
+  for(var param in obj) {
+     str.push(encodeURIComponent(param) + "=" + encodeURIComponent(obj[param]));
+  }
+  return str.join("&");
+}
+
+var GeoipApi = (function() {
+    var _baseUrl = "http://geoip.ubuntu.com/lookup";
+    return {
+        getLatLong: function(params, apiCaller, onSuccess, onError) {
+            var request = { type: "geolookup",url: _baseUrl},
+                resultHandler = (function(request, xmlDoc) {
+                    var coords = {},
+                        childNodes = xmlDoc.childNodes;
+                    for(var i=0;i<childNodes.length;i++) {
+                        if(childNodes[i].nodeName === "Latitude") {
+                            coords.lat = childNodes[i].firstChild.nodeValue;
+                        } else if(childNodes[i].nodeName === "Longitude") {
+                            coords.lon = childNodes[i].firstChild.nodeValue;
+                        }
+                    }
+                    onSuccess(coords);
+                }),
+                retryHandler = (function(err) {
+                    console.log("geolookup retry of "+err.request.url);
+                    apiCaller(request, resultHandler, onError);
+                });
+            apiCaller(request, resultHandler, retryHandler);
+        }
+    }
+})();
+
+var GeonamesApi = (function() {
+    /**
+      provides neccessary methods for requesting and preparing data from Geonames.org
+    */
+    var _baseUrl = "http://api.geonames.org/";
+    var _username = "uweatherdev"
+    var _addParams = "&maxRows=25&featureClass=P"
+    //
+    function _buildSearchResult(request, data) {
+        var searchResult = { locations: [], request: request };
+        if(data.geonames) {
+            data.geonames.forEach(function(r) {
+               searchResult.locations.push({
+                    name: r.name,
+                    coord: {lat: r.lat, lon: r.lng},
+                    country: r.countryCode,
+                    countryName: r.countryName,
+                    timezone: r.timezone,
+                    adminName1: r.adminName1,
+                    adminName2: r.adminName2,
+                    adminName3: r.adminName3,
+                    population: r.population,
+                    services: {
+                        "geonames": r.geonameId
+                    }
+                });
+            })
+        }
+        return searchResult;
+    }
+    //
+    return {
+        //
+        search: function(mode, params, apiCaller, onSuccess, onError) {
+            var request,
+                retryHandler = (function(err) {
+                        console.log("search retry of "+err.request.url);
+                        apiCaller(request, searchResponseHandler, onError);
+                }),
+                searchResponseHandler = function(request, data) {
+                    onSuccess(_buildSearchResult(request, data));
+                };
+            if(mode === "point") {
+                request = { type: "search",
+                            url: _baseUrl+ "findNearbyPlaceNameJSON?style=full&username="+encodeURIComponent(_username)
+                            +"&lat="+encodeURIComponent(params.coords.lat)+"&lng="+encodeURIComponent(params.coords.lon)
+                            +_addParams}
+            } else {
+                request = { type: "search",
+                            url: _baseUrl+ "searchJSON?style=full&username="+encodeURIComponent(_username)
+                                    +"&name_startsWith="+encodeURIComponent(params.name)+_addParams}
+            }
+            apiCaller(request, searchResponseHandler, retryHandler);
+        }
+    }
+
+})();
+
+var OpenWeatherMapApi = (function() {
+    /**
+      provides neccessary methods for requesting and preparing data from OpenWeatherMap.org
+    */
+    var _baseUrl = "http://api.openweathermap.org/data/2.5/";
+    //
+    var _serviceName = "openweathermap";
+    //
+    var _icon_map = {
+        "01d": "sun",
+        "01n": "moon",
+        "02d": "cloud_sun",
+        "02n": "cloud_moon",
+        "03d": "cloud_sun",
+        "03n": "cloud_moon",
+        "04d": "cloud",
+        "04n": "cloud",
+        "09d": "rain",
+        "09n": "rain",
+        "10d": "rain",
+        "10n": "rain",
+        "11d": "thunder",
+        "11n": "thunder",
+        "13d": "snow_shower",
+        "13n": "snow_shower",
+        "50d": "fog",
+        "50n": "fog"
+    }    
+    //
+    function _buildDataPoint(date, data) {
+        var result = {
+            timestamp: data.dt,
+            date: date,
+            metric: {
+                temp:data.main.temp,
+                windSpeed: calcKmh(data.wind.speed),
+                rain: data.main.rain || ((data.rain) ? data.rain["3h"] : false ) || 0,
+                snow: data.main.snow || ((data.snow) ? data.snow["3h"] : false ) || 0
+            },
+            imperial: {
+                temp: calcFahrenheit(data.main.temp),
+                windSpeed: calcMph(data.wind.speed),
+                rain: calcInch(data.main.rain || ((data.rain) ? data.rain["3h"] : false ) || 0),
+                snow: calcInch(data.main.snow || ((data.snow) ? data.snow["3h"] : false ) ||0)
+            },
+            humidity: data.main.humidity,
+            pressure: data.main.pressure,
+            windDeg: data.wind.deg,
+            windDir: calcWindDir(data.wind.deg),
+            icon: _icon_map[data.weather[0].icon],
+            condition: data.weather[0]
+        };
+        if(data.id !== undefined) {
+            result["service"] = _serviceName;
+            result["service_id"] =  data.id;
+        }
+        return result;
+    }
+    //
+    function _buildDayFormat(date, data) {
+        var result = {
+            date: date,
+            timestamp: data.dt,
+            metric: {
+                tempMin: data.temp.min,
+                tempMax: data.temp.max,
+                windSpeed: calcKmh(data.speed),
+                rain: data.rain || 0,
+                snow: data.snow || 0
+            },
+            imperial: {
+                tempMin: calcFahrenheit(data.temp.min),
+                tempMax: calcFahrenheit(data.temp.max),
+                windSpeed: calcMph(data.speed),
+                rain: calcInch(data.rain || 0),
+                snow: calcInch(data.snow || 0)
+            },
+            pressure: data.pressure,
+            humidity: data.humidity,
+            icon: _icon_map[data.weather[0].icon],
+            condition: data.weather[0],
+            windDeg: data.deg,
+            windDir: calcWindDir(data.deg),
+            hourly: []
+        }
+        return result;
+    }
+    //
+    function formatResult(data, location) {
+        var tmpResult = {},
+            result = [],
+            day=null,
+            offset=(location.timezone && location.timezone.gmtOffset) ? location.timezone.gmtOffset*60*60*1000: 0,
+            localNow = getLocationTime(new Date().getTime()+offset),
+            todayDate;        
+        print("["+location.name+"] "+JSON.stringify(localNow))
+        // add openweathermap id for faster responses
+        if(location.services && !location.services[_serviceName] && data["current"].id) {
+            location.services[_serviceName] = data["current"].id
+        }
+        //
+        data["daily"]["list"].forEach(function(dayData) {
+            var date = getLocationTime(((dayData.dt*1000)-1000)+offset), // minus 1 sec to handle +/-12 TZ
+                day = date.year+"-"+date.month+"-"+date.date;
+            if(!todayDate) {
+                if(localNow.year+"-"+localNow.month+"-"+localNow.date > day) {
+                    // skip "yesterday"
+                    return;
+                }
+                todayDate = date;
+            }
+            tmpResult[day] = _buildDayFormat(date, dayData);
+        })
+        //
+        var today = todayDate.year+"-"+todayDate.month+"-"+todayDate.date
+        tmpResult[today]["current"] = _buildDataPoint(todayDate, data["current"]);
+        if(data["forecast"] !== undefined) {
+            data["forecast"]["list"].forEach(function(hourData) {                
+                var dateData = getLocationTime((hourData.dt*1000)+offset),
+                    day = dateData.year+"-"+dateData.month+"-"+dateData.date;
+                if(tmpResult[day]) {
+                    tmpResult[day]["hourly"].push(_buildDataPoint(dateData, hourData));
+                }
+            })
+        }
+        //
+        for(var d in tmpResult) {
+            result.push(tmpResult[d]);
+        }
+        return result;
+    }
+    //
+    function _getUrls(params) {
+        var urls = {
+                current: "",
+                daily: "",
+                forecast: ""
+            },
+            latLongParams = "&lat="+encodeURIComponent(params.location.coord.lat)
+                + "&lon="+encodeURIComponent(params.location.coord.lon);
+        if(params.location.services && params.location.services[_serviceName]) {
+            urls.current = _baseUrl + "weather?units="+params.units+"&id="+params.location.services[_serviceName];
+            urls.daily = _baseUrl + "forecast/daily?id="+params.location.services[_serviceName]+"&cnt=10&units="+params.units
+            urls.forecast = _baseUrl + "forecast?id="+params.location.services[_serviceName]+"&units="+params.units
+
+        } else if (params.location.coord) {
+            urls.current = _baseUrl + "weather?units="+params.units+latLongParams;
+            urls.daily = _baseUrl+"forecast/daily?cnt=10&units="+params.units+latLongParams;
+            urls.forecast = _baseUrl+"forecast?units="+params.units+latLongParams;
+        }
+        return urls;
+    }
+    //
+    return {     
+        //
+        getData: function(params, apiCaller, onSuccess, onError) {
+            var urls = _getUrls(params),
+                handlerMap = {
+                current: { type: "current",url: urls.current},
+                daily: { type: "daily",url: urls.daily},
+                forecast: { type: "forecast", url: urls.forecast}},
+            response = {
+                location: params.location,
+                db: (params.db) ? params.db : null,
+                format: RESPONSE_DATA_VERSION
+            },
+            respData = {},
+            addDataToResponse = (function(request, data) {
+                var formattedResult;
+                respData[request.type] = data;
+                if(respData["current"] !== undefined
+                        && respData["forecast"] !== undefined
+                            && respData["daily"] !== undefined) {
+                    response["data"] = formatResult(respData, params.location)
+                    onSuccess(response);
+                }
+            }),
+            onErrorHandler = (function(err) {
+                onError(err);
+            }),
+            retryHandler = (function(err) {
+                console.log("retry of "+err.request.url);
+                var retryFunc = handlerMap[err.request.type];
+                apiCaller(retryFunc, addDataToResponse, onErrorHandler);
+            });
+            //
+            apiCaller(handlerMap.current, addDataToResponse, retryHandler);
+            apiCaller(handlerMap.forecast, addDataToResponse, retryHandler);
+            apiCaller(handlerMap.daily, addDataToResponse, retryHandler);
+        }
+    }
+
+})();
+
+var WeatherChannelApi = (function() {
+    /**
+      provides neccessary methods for requesting and preparing data from OpenWeatherMap.org
+    */
+    var _baseUrl = "http://wxdata.weather.com/wxdata/";
+    //
+    var _serviceName = "weatherchannel";
+    //
+    // see http://s.imwx.com/v.20131006.223722/img/wxicon/72/([0-9]+).png
+    var _iconMap = {
+        "0": "thunder", // ??
+        "1": "thunder", // ??
+        "2": "thunder", // ??
+        "3": "thunder", // ??
+        "4": "thunder", //T-Storms
+        "5": "snow_rain", //Rain / Snow
+        "6": "snow_rain", // ??
+        "7": "snow_rain", //Wintry Mix
+        "8": "scattered", //Freezing Drizzle
+        "9": "scattered", //Drizzle
+        "10": "rain", // ??
+        "11": "rain", //Showers
+        "12": "rain", //Rain
+        "13": "snow_shower", // ??
+        "14": "snow_shower", //Snow shower/Light snow
+        "15": "snow_shower", //
+        "16": "snow_shower", //Snow
+        "17": "thunder", // Hail??
+        "18": "snow_rain", // Rain / Snow ??
+        "19": "fog", //Fog ??
+        "20": "fog", //Fog
+        "21": "fog", //Haze
+        "22": "fog", // ??
+        "23": "fog", // Wind ??
+        "24": "overcast", //Partly Cloudy / Wind
+        "25": "overcast", // ??
+        "26": "overcast",//Cloudy
+        "27": "cloud_moon",//Mostly Cloudy
+        "28": "cloud_sun", //Mostly Cloudy
+        "29": "cloud_moon", //Partly Cloudy
+        "30": "cloud_sun", //Partly Cloudy
+        "31": "moon", //Clear
+        "32": "sun", //Sunny
+        "33": "cloud_moon", //Mostly Clear
+        "34": "cloud_sun", //Mostly Sunny
+        "35": "snow_rain", // ??
+        "36": "sun", //Sunny
+        "37": "thunder", //Isolated T-Storms
+        "38": "thunder", //Scattered T-Storms
+        "39": "scattered", //Scattered Showers
+        "40": "rain", // ??
+        "41": "snow", //Scattered Snow Showers
+        "42": "snow_shower", // ??
+        "43": "snow_shower", // ??
+        "44": "fog", // ??
+        "45": "scattered", // ??
+        "46": "snow_shower", //Snow Showers Early
+        "47": "thunder" //Isolated T-Storms
+    };
+    //
+    function _buildDataPoint(date, dataObj) {
+        var data = dataObj["Observation"] || dataObj,
+            result = {
+                timestamp: data.date || data.dateTime,
+                date: date,
+                metric: {
+                    temp: data.temp,
+                    tempFeels: data.feelsLike,
+                    windSpeed: data.wSpeed
+                },
+                imperial: {
+                    temp: calcFahrenheit(data.temp),
+                    tempFeels: calcFahrenheit(data.feelsLike),
+                    windSpeed: convertKmhToMph(data.wSpeed)
+                },
+                precipType: (data.precip_type !== undefined) ? data.precip_type : null,
+                propPrecip: (data.pop !== undefined) ? data.pop : null,
+                humidity: data.humid,
+                pressure: data.pressure,
+                windDeg: data.wDir,
+                windDir: data.wDirText,
+                icon: _iconMap[(data.wxIcon||data.icon)],
+                condition: data.text || data.wDesc,
+                uv: data.uv
+        };
+        if(_iconMap[data.wxIcon||data.icon] === undefined) {
+            print("ICON MISSING POINT: "+(data.wxIcon||data.icon)+" "+result.condition)
+        }
+        return result;
+    }
+    //
+    function _buildDayFormat(date, data, now) {
+        var partData = (now > data.validDate || data.day === undefined) ? data.night : data.day,
+            result = {
+            date: date,
+            timestamp: data.validDate,
+            metric: {
+                tempMin: data.minTemp,
+                tempMax: data.maxTemp,
+                windSpeed: partData.wSpeed
+            },
+            imperial: {
+                tempMin: calcFahrenheit(data.minTemp),
+                tempMax: calcFahrenheit(data.maxTemp || data.minTemp),
+                windSpeed: convertKmhToMph(partData.wSpeed)
+            },
+            precipType: partData.precip_type,
+            propPrecip: partData.pop,
+            pressure: null,
+            humidity: partData.humid,
+            icon: _iconMap[partData.icon],
+            condition: partData.phrase,
+            windDeg: partData.wDir,
+            windDir: partData.wDirText,
+            uv: partData.uv,
+            hourly: []
+        }
+        if(_iconMap[partData.icon] === undefined) {
+            print("ICON MISSING  DAY: "+partData.icon+" "+result.condition)
+        }
+        return result;
+    }
+    //
+    function formatResult(combinedData, location) {
+        var tmpResult = {}, result = [],
+            day=null, todayDate,
+            offset=(location.timezone && location.timezone.gmtOffset) ? location.timezone.gmtOffset*60*60*1000: 0,
+            now = new Date().getTime(),
+            nowMs = parseInt(now/1000),
+            localNow = getLocationTime(now+offset),
+            data = {
+                "location": combinedData[0]["Location"],
+                "daily": combinedData[0]["DailyForecasts"],
+                "forecast": combinedData[0]["HourlyForecasts"],
+                "current": combinedData[0]["StandardObservation"],
+            };
+        print("["+location.name+"] "+JSON.stringify(localNow));
+        // add openweathermap id for faster responses
+        if(location.services && !location.services[_serviceName] && data["location"].key) {
+            location.services[_serviceName] = data["location"].key
+        }                
+        // only 5 days of forecast for TWC
+        for(var x=0;x<5;x++) {
+            var dayData = data["daily"][x],
+                date = getLocationTime(((dayData.validDate*1000)-1000)+offset); // minus 1 sec to handle +/-12 TZ
+            day = date.year+"-"+date.month+"-"+date.date;
+            if(!todayDate) {
+                if(localNow.year+"-"+localNow.month+"-"+localNow.date > day) {
+                    // skip "yesterday"
+                    continue;
+                }
+                todayDate = date;
+            }
+            tmpResult[day] = _buildDayFormat(date, dayData, nowMs);
+        }
+        //
+        if(data["current"]) {
+            var today = todayDate.year+"-"+todayDate.month+"-"+todayDate.date
+            tmpResult[today]["current"] = _buildDataPoint(todayDate, data["current"]);
+        }
+        if(data["forecast"] !== undefined) {
+            data["forecast"].forEach(function(hourData) {
+                var dateData = getLocationTime((hourData.dateTime*1000)+offset),
+                    day = dateData.year+"-"+dateData.month+"-"+dateData.date;
+                if(tmpResult[day]) {                    
+                    tmpResult[day]["hourly"].push(_buildDataPoint(dateData, hourData));
+                }
+            })
+        }
+        //
+        for(var d in tmpResult) {
+            result.push(tmpResult[d]);
+        }
+        return result;
+    }
+    //
+    function _getUrl(params) {
+        var url, serviceId,
+            baseParams = {
+                key: params.api_key,
+                units: (params.units === "metric") ? "m" : "e",
+                locale: Qt.locale().name,
+                hours: "48",
+            },
+            commands = {
+                "mobileaggregation": "mobile/mobagg/",
+            };
+        if(params.location.services && params.location.services[_serviceName]) {
+            serviceId = encodeURIComponent(params.location.services[_serviceName]);
+            url = _baseUrl+commands["mobileaggregation"]+serviceId+".js?"+parameterize(baseParams);
+        } else if (params.location.coord) {
+            var coord = {lat: params.location.coord.lat, lng: params.location.coord.lon};
+            url = _baseUrl+commands["mobileaggregation"]+"get.js?"+parameterize(baseParams)+"&"+
+                  parameterize(coord);
+        }
+        return url;
+    }
+    //
+    return {
+        getData: function(params, apiCaller, onSuccess, onError) {
+            var url = _getUrl(params),
+                handlerMap = {
+                    all: { type: "all", url: url}
+                },
+                response = {
+                    location: params.location,
+                    db: (params.db) ? params.db : null,
+                    format: RESPONSE_DATA_VERSION
+                },
+                addDataToResponse = (function(request, data) {
+                    var formattedResult;
+                    response["data"] = formatResult(data, params.location);
+                    onSuccess(response);
+                }),
+                onErrorHandler = (function(err) {
+                    onError(err);
+                });
+            apiCaller(handlerMap.all, addDataToResponse, onErrorHandler);
+        }
+    }
+})();
+
+var WeatherApi = (function(_services) {
+    /**
+      proxy for requesting weather apis, the passed _services are providing the respective api endpoints
+      and formatters to build a uniform response object
+    */
+    function _getService(name) {
+        if(_services[name] !== undefined) {
+            return _services[name];
+        }
+        return _services["weatherchannel"];
+    }
+    //
+    function _sendRequest(request, onSuccess, onError) {
+        var xmlHttp = new XMLHttpRequest();
+        if (xmlHttp) {
+            console.log("Sent request URL: " + request.url);
+            xmlHttp.open('GET', request.url, true);
+            xmlHttp.onreadystatechange = function () {
+                try {
+                    if (xmlHttp.readyState == 4) {
+                        if(xmlHttp.status === 200) {
+                            if(xmlHttp.responseXML) {
+                                onSuccess(request, xmlHttp.responseXML.documentElement);
+                            } else {
+                                var json = JSON.parse(xmlHttp.responseText);
+                                onSuccess(request,json);
+                            }
+                        } else {
+                            onError({
+                                msg: "wrong response http code, got "+xmlHttp.status,
+                                request: request
+                            });
+                        }
+                    }
+                } catch (e) {
+                    print("Exception: "+e)
+                    onError({msg: "wrong response data format", request: request});
+                }
+            };
+            xmlHttp.send(null);
+        }
+    }
+    //
+    return  {
+        //
+        geoLookup: function(params, onSuccess, onError) {
+            var service = _getService('geoip'),
+                geoNameService = _getService('geonames'),
+                lookupHandler = function(data) {
+                    print("Geolookup: "+JSON.stringify(data))
+                    geoNameService.search("point", {coords:data}, _sendRequest, onSuccess, onError);
+                };
+            service.getLatLong(params, _sendRequest, lookupHandler, onError)
+        },
+        //
+        search: function(mode, params, onSuccess, onError) {
+            var service = _getService('geonames');
+            service.search(mode, params, _sendRequest, onSuccess, onError);
+        },
+        //
+        getLocationData: function(params, onSuccess, onError) {
+            var service = _getService(params.service);
+            service.getData(params, _sendRequest, onSuccess, onError);
+        },
+    }
+})({
+    "openweathermap": OpenWeatherMapApi,
+    "weatherchannel": WeatherChannelApi,
+    "geonames": GeonamesApi,
+    "geoip": GeoipApi
+});
+
+var sendRequest = function(message, responseCallback) {
+    // handles the response data
+    var finished = function(result) {
+        // print result to get data for test json files
+        // print(JSON.stringify(result));
+        //WorkerScript.sendMessage({
+        responseCallback({
+            action: message.action,
+            result: result
+        })
+    }
+    // handles errors
+    var onError = function(err) {
+        console.log(JSON.stringify(err, null, true));
+        //WorkerScript.sendMessage({ 'error': err})
+        responseCallback({ 'error': err})
+    }
+    // keep order of locations, sort results
+    var sortDataResults = function(locA, locB) {
+        return locA.db.id - locB.db.id;
+    }
+    // perform the api calls
+    if(message.action === "searchByName") {
+        WeatherApi.search("name", message.params, finished, onError);
+    } else if(message.action === "searchByPoint") {
+        WeatherApi.search("point", message.params, finished, onError);
+    } else if(message.action === "getGeoIp") {
+        WeatherApi.geoLookup(message.params, finished, onError);
+    } else if(message.action === "updateData") {
+        var locLength = message.params.locations.length,
+            locUpdated = 0,
+            result = [],
+            now = new Date().getTime();
+        if(locLength > 0) {
+            message.params.locations.forEach(function(loc) {
+                var updatedHnd = function (newData, cached) {
+                        locUpdated += 1;
+                        if(cached === true) {
+                            newData["save"] = false;
+                        } else {
+                            newData["save"] = true;
+                            newData["updated"] =  new Date().getTime();
+                        }
+                        result.push(newData);
+                        if(locUpdated === locLength) {
+                            result.sort(sortDataResults);
+                            finished(result);
+                        }
+                    },
+                    params = {
+                        location:loc.location,
+                        db: loc.db,
+                        units: 'metric',
+                        service: message.params.service,
+                        api_key: message.params.api_key
+                    },
+                    secsFromLastFetch = (now-loc.updated)/1000;
+                if( message.params.force===true || loc.format !== RESPONSE_DATA_VERSION || secsFromLastFetch > 1800){
+                    // data older than 30min, location is new or data format is deprecated
+                    WeatherApi.getLocationData(params, updatedHnd, onError);
+                } else {
+                    console.log("["+loc.location.name+"] returning cached data, time from last fetch: "+secsFromLastFetch)
+                    updatedHnd(loc, true);
+                }
+            })
+        } else {
+            finished(result);
+        }
+    }
+}

=== added file 'app/data/key.js'
--- app/data/key.js	1970-01-01 00:00:00 +0000
+++ app/data/key.js	2015-02-07 17:39:34 +0000
@@ -0,0 +1,1 @@
+var twcKey = "";

=== added file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml	1970-01-01 00:00:00 +0000
+++ app/ubuntu-weather-app.qml	2015-02-07 17:39:34 +0000
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This file is part of Ubuntu Weather App
+ *
+ * Ubuntu Weather App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Weather App is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import "components"
+import "data" as Data
+import "data/WeatherApi.js" as WeatherApi
+import "data/key.js" as Key
+import "ui"
+
+MainView {
+    id: weatherApp
+
+    objectName: "weather"
+
+    applicationName: "com.ubuntu.weather"
+
+    automaticOrientation: false
+
+    width: units.gu(40)
+    height: units.gu(70)
+
+    backgroundColor: "#F5F5F5"
+
+    useDeprecatedToolbar: false
+    anchorToKeyboard: true
+
+    /*
+      List of locations and their data, accessible through index
+    */
+    property var locationsList: []
+
+    /*
+      Index of Location before a refresh, to go back after
+    */
+    property int indexAtRefresh: -1
+
+    /*
+      Set default values for settings here
+    */
+    property var settings: {
+        "units": Qt.locale().measurementSystem === Locale.MetricSystem ? "metric" : "imperial",
+        "wind_units": Qt.locale().measurementSystem === Locale.MetricSystem ? "kmh" : "mph",
+        "precip_units": Qt.locale().measurementSystem === Locale.MetricSystem ? "mm" : "in",
+        "service": "weatherchannel"
+    }
+
+    /*
+      Scale symbols and labels.
+    */
+    property string tempScale
+    property string speedScale
+    property string precipScale
+    property string tempUnits
+    property string windUnits
+    property string precipUnits
+
+    /*
+      After reading the settings from storage and updating the default
+      settings with the user selected ones, (re)load pages!
+    */
+    Component.onCompleted: {
+        storage.getSettings(function(storedSettings) {
+            for(var settingName in storedSettings) {
+                settings[settingName] = storedSettings[settingName];
+            }
+            setScalesAndLabels();
+            refreshData();
+        })
+    }
+
+    function setScalesAndLabels() {
+        // set scales
+        tempScale = String("°") + ((settings["units"] === "imperial") ? "F" : "C")
+        speedScale = ((settings["wind_units"] === "mph") ? "mph" : "km/h")
+        precipScale = ((settings["precip_units"] === "in") ? "in" : "mm")
+        tempUnits = ((settings["units"] === 'imperial') ? 'imperial' : 'metric')
+        windUnits = ((settings["wind_units"] === 'mph') ? 'imperial' : 'metric')
+        precipUnits = ((settings["precip_units"] === 'in') ? 'imperial' : 'metric')
+    }
+
+    /*
+      Handle response data from data backend. Checks if a location
+      was updated and has to be stored again.
+    */
+    function responseDataHandler(messageObject) {
+         if(!messageObject.error) {
+             if(messageObject.action === "updateData") {
+                 messageObject.result.forEach(function(loc) {
+                     // replace location data in cache with refreshed values
+                     if(loc["save"] === true) {
+                         storage.updateLocation(loc.db.id, loc);
+                     }
+                 });
+                 //print(JSON.stringify(messageObject.result));
+                 fillPages(messageObject.result);
+             }
+         } else {
+             console.log(messageObject.error.msg+" / "+messageObject.error.request.url)
+             // TODO error handling
+         }
+     }
+
+    /* Fill the location pages with their data. */
+    function fillPages(locations) {
+        locationsList = locations;
+        // refactor this when Location are in a ListView!
+        homePage.renderData();
+    }
+
+    /*
+      Refresh data, either directly from storage or by checking against
+      API instead.
+    */
+    function refreshData(from_storage, force_refresh) {
+        if(from_storage === true && force_refresh !== true) {
+            storage.getLocations(fillPages);
+        } else {
+            storage.getLocations(function(locations) {
+                WeatherApi.sendRequest({
+                    action: "updateData",
+                    params: {
+                        locations:locations,
+                        force:force_refresh,
+                        service:settings["service"],
+                        api_key: Key.twcKey
+                    }
+                }, responseDataHandler)
+            });
+        }
+    }
+
+    Data.Storage {
+        id: storage
+    }
+
+    PageStack {
+        id: mainPageStack
+
+        HomePage {
+            id: homePage
+        }
+
+        Component.onCompleted: mainPageStack.push(homePage)
+    }
+}

=== added directory 'app/ui'
=== added file 'app/ui/CMakeLists.txt'
--- app/ui/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ app/ui/CMakeLists.txt	2015-02-07 17:39:34 +0000
@@ -0,0 +1,5 @@
+file(GLOB UI_QML_JS_FILES *.qml *.js)
+
+add_custom_target(ubuntu-weather-app_ui_QMlFiles ALL SOURCES ${UI_QML_JS_FILES})
+
+install(FILES ${UI_QML_JS_FILES} DESTINATION ${UBUNTU-WEATHER_APP_DIR}/ui)

=== added file 'app/ui/HomePage.qml'
--- app/ui/HomePage.qml	1970-01-01 00:00:00 +0000
+++ app/ui/HomePage.qml	2015-02-07 17:39:34 +0000
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This file is part of Ubuntu Weather App
+ *
+ * Ubuntu Weather App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Weather App is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import "../components"
+
+
+Page {
+    // Set to null otherwise the header is shown (but blank) over the top of the listview
+    id: locationPage
+    flickable: null
+
+    /*
+      Data properties
+    */
+    property string name;
+    property string conditionText
+    property int currentTemp
+    property string todayMaxTemp
+    property string todayMinTemp
+    property string iconName
+
+    // TODO map iconnames to source image names
+    property var iconMap: {
+        "moon": "moon.svg"
+        // etc pp
+    }
+
+    /*
+      Format date object by given format.
+    */
+    function formatTimestamp(dateData, format) {
+        var date = new Date(dateData.year, dateData.month, dateData.date, dateData.hours, dateData.minutes)
+        return Qt.formatDate(date, i18n.tr(format))
+    }
+
+    /*
+      Extracts values from the location weather data and puts them into the appropriate components
+      to display them.
+
+      Attention: Data access happens through "weatherApp.locationList[]" by index, since complex
+      data in models will lead to type problems.
+    */
+    function renderData() {
+        var index = Math.floor(Math.random()*weatherApp.locationsList.length), // TODO get this value from ListView.currentIndex later!
+            data = weatherApp.locationsList[index],
+            current = data.data[0].current,
+            forecasts = data.data,
+            forecastsLength = forecasts.length,
+            today = forecasts[0],
+            tempUnits = weatherApp.tempUnits,
+            tempScale = weatherApp.tempScale;
+
+        // set general location data
+        name = data.location.adminName1;
+
+        // set current temps and condition
+        iconName = (current.icon) ? current.icon : ""
+        conditionText = (current.condition.main) ? current.condition.main : current.condition; // difference TWC/OWM
+        todayMaxTemp = (today[tempUnits].tempMax) ? Math.round(today[tempUnits].tempMax).toString() + tempScale: "";
+        todayMinTemp = Math.round(today[tempUnits].tempMin.toString()) + tempScale;
+        currentTemp = Math.round(current[tempUnits].temp);
+
+        // reset days list
+        mainPageWeekdayListView.model.clear()
+
+        // set daily forecasts
+        if(forecastsLength > 0) {
+            for(var x=1;x<forecastsLength;x++) {
+                // print(JSON.stringify(forecasts[x][units]))
+                var dayData = {
+                    day: formatTimestamp(forecasts[x].date, 'dddd'),
+                    low: Math.round(forecasts[x][tempUnits].tempMin).toString() + tempScale,
+                    high: (forecasts[x][tempUnits].tempMax !== undefined) ? Math.round(forecasts[x][tempUnits].tempMax).toString() + tempScale : "",
+                    image: (forecasts[x].icon !== undefined && iconMap[forecasts[x].icon] !== undefined) ? iconMap[forecasts[x].icon] + tempScale : ""
+                }
+                mainPageWeekdayListView.model.append(dayData);
+            }
+        }
+    }
+
+    ListView {
+        id: mainPageWeekdayListView
+        anchors {
+            fill: parent
+            margins: units.gu(2)
+        }
+
+        header: Column {
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            spacing: units.gu(1)
+
+            HeaderRow {
+                locationName: locationPage.name
+            }
+
+            HomeGraphic {
+                icon: locationPage.iconName
+            }
+
+            HomeTempInfo {
+                description: locationPage.conditionText
+                high: locationPage.todayMaxTemp
+                low: locationPage.todayMinTemp
+                now: locationPage.currentTemp
+            }
+
+            ListItem.ThinDivider {
+
+            }
+        }
+        model: ListModel {}
+
+        delegate: DayDelegate {
+            day: model.day
+            high: model.high
+            low: model.low
+        }
+    }
+}

=== added file 'app/[e-mail]'
Binary files app/[e-mail]	1970-01-01 00:00:00 +0000 and app/[e-mail]	2015-02-07 17:39:34 +0000 differ
=== added directory 'backend'
=== added file 'backend/CMakeLists.txt'
--- backend/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ backend/CMakeLists.txt	2015-02-07 17:39:34 +0000
@@ -0,0 +1,29 @@
+project(backend)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+#set(
+#    timeZone_SRCS
+#    TimeZone/timezone.cpp
+#    TimeZone/timezone_plugin.cpp
+#)
+
+#add_library(TimeZoneBackend MODULE
+#    ${timeZone_SRCS}
+#)
+#set_target_properties(TimeZoneBackend PROPERTIES
+#         LIBRARY_OUTPUT_DIRECTORY TimeZone)
+
+#qt5_use_modules(TimeZoneBackend Gui Qml Quick)
+
+# Copy qmldir file to build dir for running in QtCreator
+#add_custom_target(TimeZoneBackend-qmldir ALL
+#    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/TimeZone/qmldir ${CMAKE_CURRENT_BINARY_DIR}/TimeZone
+#    DEPENDS ${QML_JS_FILES}
+#)
+
+# Install plugin file
+#install(TARGETS TimeZoneBackend DESTINATION ${QT_IMPORTS_DIR}/qt5/qml/UbuntuWeather/TimeZone/)
+#install(FILES TimeZone/qmldir DESTINATION ${QT_IMPORTS_DIR}/qt5/qml/UbuntuWeather/TimeZone/)

=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2015-02-07 17:39:34 +0000
@@ -0,0 +1,173 @@
+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 ]
+  * Initial version of reboot
+
+ -- Andrew Hayzen <[e-mail]>  Mon, 02 Feb 2014 15:10:00 +0000
+
+ubuntu-weather-app (1.8.3ubuntu1) utopic; urgency=low
+
+  [ Dan Chapman ]
+  * Add timezone c++ extension plugin
+
+ -- Dan Chapman <[e-mail]>  Thu, 25 Sep 2014 10:46:29 +0100
+
+ubuntu-weather-app (1.8.3) raring; urgency=low
+
+  [ Martin Borho ]
+  * updated icons for rain and snow
+  * bug fixes and optimizations
+
+  [ Alan Pope ]
+  * Update click framework and apparmor profile version (LP: #1315318) 
+
+ -- Alan Pope <[e-mail]>  Fri, 02 May 2014 13:51:57 +0100
+
+ubuntu-weather-app (1.8.1ubuntu1) UNRELEASED; urgency=low
+
+  * added missing icon
+
+ -- Martin Borho <[e-mail]>  Sun, 23 Mar 2014 13:06:17 +0000
+
+ubuntu-weather-app (1.8ubuntu1) UNRELEASED; urgency=low
+
+  [Leo Arias]
+  * Port to autopilot 1.4.
+  * Set the objectNames for the settings options.
+
+  [Nicholas Skaggs]
+  * Fixed test_del_add_bug test, simplify tests, re-enable disabled tests.
+  * Redo create blank db, ensure it's being used across all tests.
+  * Add cmake build.
+  * Set revno to match store.
+  * Updated tests to use more emulator standards.
+  * Tweaked activity indicator handling.
+
+  [Dennis O'Flaherty]
+  * Load weather for the selected city when clicking the OWM logo instead of loading for London.
+
+  [Raul Yeguas]
+  * Added an modified logo for OpenWeatherMap (have mercy on me, christina-li and michal) and an action to open its website on click.
+  * Added animations for daily and houly forecast scroll.
+  * Improved animation speed by reducing image size.
+  * Removes SideStage hint, fixes related to the sizes of the current weather data display on tablets.
+
+  [Victor Thompson]
+  * Added unit of measure for main temperature value.
+  * Fixed conversion of wind speed data for TWC data.
+  * Prevent predictive text in search bar.
+
+  [Arash Badie Modiri]
+  * Changed a translation string into something a little bit more general.
+
+  [Martin Borho]
+  * Optimized and added haptic effect to hourly scrolling .
+  * Added The Weather Channel as default weather data provider.
+  * Added keyboard shortcuts.
+  * Initial tablet design of the Weather app.
+  * Refactored all width:parent.width and height:parent.height through corresponding anchors
+  * Fixed edit dialog to fill window on N7 2013 landscape
+  * Fixed weather AP tests to not assume tablet mode
+  * Fixed content sticking to the top, when height was changed in phone mode
+  * Fixed StateNotFoundError failures in image 206
+  * Removed WorkerScriptfor API calls
+  * New icon names used in API clients
+  * Using the current condition icon for the current day
+
+  [David Planella]
+  * Fixed the rule to generate a .pot template after the migration to cmake.
+  * Minor improvements on the weather API: added parameterize(), added locale parameters to TWC calls
+  * Fixes empty TWC URL if locale is not supported.
+  * Adds documentation for the The Weather Channel API.
+  * Makes the provider footer to be full width in order for it to make it look good on a Nexus 7.
+  * Fixes the shorter length header on the N7 using anchors instead of widths.
+
+  [Alan Pope]
+  * New icon.
+
+ -- Martin Borho <[e-mail]>  Fri, 21 Mar 2014 11:26:17 +0000
+
+ubuntu-weather-app (1.0ubuntu1) UNRELEASED; urgency=medium
+
+  * New icon 
+
+ -- Alan Pope <[e-mail]>  Tue, 18 Feb 2014 21:26:17 +0000
+
+ubuntu-weather-app (1.0) saucy; urgency=low
+
+  [Andrew Starr-Bochicchio]
+  * Use the system locale to determine both the default units and the display of time.
+  * Add predictive search for locations. (LP: #1218910)
+  * Increase visibility of ActivityIndicator (LP: #1218904)
+
+  [David Planella]
+  * Updated translatable strings, a couple of small fixes to ease translations
+
+  [Dennis O'Flaherty]
+  * Fixes for precipitation values.
+
+  [Martin Borho]
+  * Removing a location add adding a new one fails. (LP: #1230297)
+  * Added location lookup via geoip and geonames.org with test (LP: #1187312, #1188726)
+  * Added fixes for new removable ListItem and the changed LocalStorage path. (LP: #1234544)
+  * Added setting for precipitation unit, mm or in.
+  * Location search now via geonames.org. (LP: #1230153)
+  * Updated predefined cities list.
+  * Added component for notifications.
+  * Added bottom margin to scrolling area in tabs and moved warm colors up the gradient color scheme.
+  * Visual improvements and fixes to LocationManagerSheet and AddLocationSheet. (LP: #1198541, #1221734)
+  * Added updated label, removed years from date labels. (LP: #1219200, #1221149, #1221162)
+  * Improved scrolling, added slow/fast scrolling for day/hour scrolling distinction. (LP:# 1221169)
+  * Added option in settings to change the wind speed unit. (LP: #1214934, #1190784)
+  * Dynamic gradient backgrounds according to the visual design.
+  * Added missing localstorage dependency.
+
+  [Nicholas Skaags]
+  * Add support for testing via click packages.
+
+  [Raúl Yeguas]
+  * Updated colors in GradientsMap.js. (LP: #1226746)
+  * Returns the last element to primary information screen and skip animation. (LP: #1227150)
+  * improved CurrentTemp text size
+  * UbuntuAnimations should be used (LP: #1218805)
+  * Replaced ValueSelector with new OptionSelector in Settings.
+  * Implemented a new scrolling.
+  * Added pressure data and modified the transition animation.
+  * Font color should be always white, with drop shadow.
+
+  [Sergio Schvezov]
+  * changing applicationName to com.ubuntu.weather to write in the unconfined areas
+  * cleaning up python code
+  * add the click data into the package and added apparmor rules (LP: #121839)
+
+ -- Martin Borho <[e-mail]>  Tue, 8 Oct 2013 22:42:00 +0200
+
+ubuntu-weather-app (0.3) raring; urgency=low
+  
+  * LocationManager-Sheet added
+  * Settings-Sheet added
+  * Autopilot tests
+  * Data-provider calls now in WorkerScript
+  * ActivityIndicators while loading
+  * Suru theme added
+  * Displaying more weather data for every location
+
+ -- Martin Borho <[e-mail]>  Tue, 13 Aug 2013 21:33:33 +0200
+
+ubuntu-weather-app (0.2) raring; urgency=low
+
+  * Added support for packaging and installing translations 
+
+ -- David Planella <[e-mail]>  Tue, 28 May 2013 14:21:33 +0200
+
+ubuntu-weather-app (0.1) raring; urgency=low
+
+  * Initial release
+
+ -- Michael Hall <[e-mail]>  Mon, 11 Feb 2013 16:04:00 -0500

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2015-02-07 17:39:34 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2015-02-07 17:39:34 +0000
@@ -0,0 +1,40 @@
+Source: ubuntu-weather-app
+Priority: extra
+Maintainer: Ubuntu App Cats <[e-mail]>
+Build-Depends: cmake,
+               debhelper (>= 9),
+               gettext,
+               intltool,
+               python3 | python-all | python3-dev | python3-all-dev,
+               python3-minimal,
+               qtbase5-dev,
+               qtbase5-dev-tools,
+               qtdeclarative5-dev,
+               qtdeclarative5-dev-tools,
+               qtdeclarative5-ubuntu-ui-toolkit-plugin,
+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
+
+Package: ubuntu-weather-app
+Architecture: all
+Depends: qmlscene,
+         qtdeclarative5-localstorage-plugin,
+         qtdeclarative5-qtquick2-plugin,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
+         suru-icon-theme | ubuntu-mobile-icons,
+         ${misc:Depends}
+Description: Weather application
+ Core Weather application
+
+Package: ubuntu-weather-app-autopilot
+Architecture: all
+Depends: libautopilot-qt (>= 1.4),
+         libqt5test5,
+         libqt5widgets5,
+         ubuntu-ui-toolkit-autopilot,
+         ubuntu-weather-app (>= ${source:Version}),
+         ${misc:Depends}
+Description: Test package for the weather app
+ Autopilot tests for the weather app package

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2015-02-07 17:39:34 +0000
@@ -0,0 +1,54 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ubuntu-weather-app
+Source: https://launchpad.net/ubuntu-weather-app
+
+Files: *
+Copyright: 2013 Canonical Ltd.
+           2013 Jakub <[e-mail]>
+           2013 Martin Borho <[e-mail]>
+           2013 Nekhelesh Ramananthan <[e-mail]>
+           2013 Omer Akram <[e-mail]>
+           2013 Raúl Yeguas <[e-mail]>
+           2013 Riccardo Padovani <[e-mail]>
+           2013 Zonov Roman <[e-mail]>
+           2015 Andrew Hayzen <[e-mail]>
+           2015 Victor Thompson <[e-mail]>
+License: GPL-3
+
+Files: debian/*
+Copyright: 2013 Canonical Ltd.
+License: LGPL-3
+
+License: GPL-3
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in "/usr/share/common-licenses/GPL-3".
+
+License: LGPL-3
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-3".

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2015-02-07 17:39:34 +0000
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DCLICK_MODE=OFF
+
+override_dh_install:
+	dh_install --list-missing

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2015-02-07 17:39:34 +0000
@@ -0,0 +1,1 @@
+1.0

=== 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-07 17:39:34 +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-07 17:39:34 +0000
@@ -0,0 +1,1 @@
+usr/share

=== added file 'manifest.json.in'
--- manifest.json.in	1970-01-01 00:00:00 +0000
+++ manifest.json.in	2015-02-07 17:39:34 +0000
@@ -0,0 +1,23 @@
+{
+    "architecture": "@CLICK_ARCH@",
+    "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",
+    "framework": "ubuntu-sdk-14.10",
+    "hooks": {
+        "weather": {
+            "apparmor": "ubuntu-weather-app.apparmor",
+            "desktop": "@CMAKE_INSTALL_DATADIR@/applications/ubuntu-weather-app.desktop"
+        }
+    },
+    "icon": "@ICON@",
+    "maintainer": "Ubuntu App Cats <[e-mail]>",
+    "name": "@PROJECT_NAME@",
+    "title": "Weather",
+    "version": "3.0.@BZR_REVNO@",
+    "x-source": {
+        "vcs-bzr": "@BZR_SOURCE@",
+        "vcs-bzr-revno": "@BZR_REVNO@"
+    },
+    "x-test": {
+        "autopilot": "@AUTOPILOT_DIR@"
+    }
+}

=== added directory 'po'
=== renamed directory 'po' => 'po.moved'
=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2015-02-07 17:39:34 +0000
@@ -0,0 +1,33 @@
+include(FindGettext)
+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+
+set(DOMAIN ${PROJECT_NAME})
+set(POT_FILE ${DOMAIN}.pot)
+file(GLOB PO_FILES *.po)
+
+# Creates the .pot file containing the translations template
+add_custom_target(${POT_FILE} ALL
+    COMMENT "Generating translation template"
+    COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
+        --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in
+    COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
+        -D ${CMAKE_CURRENT_SOURCE_DIR}
+        -D ${CMAKE_CURRENT_BINARY_DIR}
+        --from-code=UTF-8
+        --c++ --qt --add-comments=TRANSLATORS
+        --keyword=tr --keyword=tr:1,2 --keyword=N_
+        --package-name='${APP_HARDCODE}'
+        --copyright-holder='Canonical Ltd.'
+        ${I18N_SRC_FILES}
+    COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR})
+
+# Builds the binary translations catalog for each language
+# it finds source translations (*.po) for
+foreach(PO_FILE ${PO_FILES})
+    get_filename_component(LANG ${PO_FILE} NAME_WE)
+    gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
+    set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
+            DESTINATION ${INSTALL_DIR}
+            RENAME ${DOMAIN}.mo)
+endforeach(PO_FILE)

=== added file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	1970-01-01 00:00:00 +0000
+++ po/com.ubuntu.weather.pot	2015-02-07 17:39:34 +0000
@@ -0,0 +1,36 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-weather-app\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-02-07 18:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../app/components/HomeTempInfo.qml:38
+msgid "Today"
+msgstr ""
+
+#: ubuntu-weather-app.desktop.in.in.h:1
+msgid "Weather"
+msgstr ""
+
+#: ubuntu-weather-app.desktop.in.in.h:2
+msgid ""
+"A weather forecast application for Ubuntu with support for multiple online "
+"weather data sources"
+msgstr ""
+
+#: ubuntu-weather-app.desktop.in.in.h:3
+msgid "weather;forecast;twc;openweathermap;the weather channel;"
+msgstr ""

=== added directory 'tests'
=== renamed directory 'tests' => 'tests.moved'
=== added file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/CMakeLists.txt	2015-02-07 17:39:34 +0000
@@ -0,0 +1,3 @@
+if(NOT CLICK_MODE)
+  add_subdirectory(autopilot)
+endif(NOT CLICK_MODE)

=== added directory 'tests/autopilot'
=== added file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/autopilot/CMakeLists.txt	2015-02-07 17:39:34 +0000
@@ -0,0 +1,8 @@
+if(INSTALL_TESTS)
+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
+    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+install(DIRECTORY ${AUTOPILOT_DIR}
+    DESTINATION ${PYTHON_PACKAGE_DIR}
+    )
+endif(INSTALL_TESTS)

=== added directory 'tests/autopilot/ubuntu_weather_app'
=== added file 'ubuntu-weather-app.apparmor'
--- ubuntu-weather-app.apparmor	1970-01-01 00:00:00 +0000
+++ ubuntu-weather-app.apparmor	2015-02-07 17:39:34 +0000
@@ -0,0 +1,6 @@
+{
+    "policy_groups": [
+    	"networking"
+    ], 
+    "policy_version": 1.2
+}

=== added file 'ubuntu-weather-app.desktop.in.in'
--- ubuntu-weather-app.desktop.in.in	1970-01-01 00:00:00 +0000
+++ ubuntu-weather-app.desktop.in.in	2015-02-07 17:39:34 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Terminal=false
+Exec=@EXEC@
+Icon=@ICON@
+_Name=Weather
+_Comment=A weather forecast application for Ubuntu with support for multiple online weather data sources
+_Keywords=weather;forecast;twc;openweathermap;the weather channel;
+X-Ubuntu-Touch=true
+X-Ubuntu-Default-Department-ID=accessories
+X-Ubuntu-Splash-Color=#F5F5F5