lp:~vthompson/ubuntu-weather-app/build-reboot

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-weather-app at revision 2

Martin Borho: Approve on 2015-01-25

Nekhelesh Ramananthan (community): Approve on 2015-01-24

Diff: 499 lines (+255/-117)

14 files modified

CMakeLists.txt (+75/-62)
app/CMakeLists.txt (+15/-0)
app/components/CMakeLists.txt (+5/-0)
app/ubuntu-weather-app.qml (+49/-0)
backend/CMakeLists.txt (+29/-0)
click/CMakeLists.txt (+0/-15)
manifest.json.in (+3/-3)
po/CMakeLists.txt (+33/-0)
po/com.ubuntu.weather.pot (+32/-0)
tests/CMakeLists.txt (+3/-0)
tests/autopilot/CMakeLists.txt (+8/-0)
ubuntu-weather-app.apparmor (+3/-2)
ubuntu-weather-app.in (+0/-3)
ubuntu-weather-app.qmlproject (+0/-32)

api

Superseded for merging into lp:ubuntu-weather-app/obsolete.trunk

Ubuntu Weather Developers: Pending requested 2015-01-23

Diff: 1103 lines (+1000/-0) (has conflicts)

16 files modified

.bzrignore (+19/-0)
CMakeLists.txt (+95/-0)
COPYING (+674/-0)
README (+11/-0)
README.translations (+40/-0)
click/CMakeLists.txt (+15/-0)
click/manifest.json.in (+23/-0)
click/weather.apparmor (+5/-0)
com.ubuntu.weather_weather.desktop.in.in (+12/-0)
components/CMakeLists.txt (+2/-0)
plugins/CMakeLists.txt (+27/-0)
po/CMakeLists.txt (+33/-0)
tests/CMakeLists.txt (+1/-0)
tests/autopilot/CMakeLists.txt (+8/-0)
ubuntu-weather-app.in (+3/-0)
ubuntu-weather-app.qmlproject (+32/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

5. By Victor Thompson on 2015-01-24

Remove last Clock app reference

4. By Victor Thompson on 2015-01-24

Merge nik90's changes

Merged branch lp:~nik90/ubuntu-weather-app/weather-reboot-fixes

3. By Victor Thompson on 2015-01-23

Update file structure

2. By Victor Thompson on 2015-01-23

* Fill out file structure to allow CMake to build, assuming old file layout.

1. By Andrew Hayzen on 2015-01-22

* Initial commit