lp:~ubuntu-weather-dev/ubuntu-weather-app/timezone-plugin

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-weather-app/obsolete.trunk at revision 376

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2014-10-08

Nicholas Skaggs: Pending requested 2014-10-08

Daniel Holbach: Pending requested 2014-10-08

Diff: 336 lines (+194/-9)

13 files modified

CMakeLists.txt (+21/-1)
click/manifest.json.in (+1/-1)
debian/changelog (+7/-0)
debian/control (+20/-6)
debian/qtdeclarative5-ubuntuweather-timezone-plugin1.0.install (+1/-0)
debian/rules (+3/-0)
plugins/CMakeLists.txt (+27/-0)
plugins/TimeZone/qmldir (+2/-0)
plugins/TimeZone/timezone.cpp (+30/-0)
plugins/TimeZone/timezone.h (+48/-0)
plugins/TimeZone/timezone_plugin.cpp (+15/-0)
plugins/TimeZone/timezone_plugin.h (+18/-0)
po/com.ubuntu.weather.pot (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

384. By Nicholas Skaggs on 2014-10-08

merge dholbach's tweaks

383. By Dan Chapman  on 2014-09-29

Fix missing , in control file (I'm definately am not a debian packager that's for sure :-D )

382. By Dan Chapman  on 2014-09-29

Fix missing , in control file (I'm definately am not a debian packager that's for sure :-D )

381. By Dan Chapman  on 2014-09-29

Modify debian/control again

380. By Dan Chapman  on 2014-09-29

Modified control file

379. By Dan Chapman  on 2014-09-29

add qtbase5-dev-tools

378. By Dan Chapman  on 2014-09-29

add qtdeclarative5-dev-tools

377. By Dan Chapman  on 2014-09-26

Revert to qtdeclarative5-dev

376. By Dan Chapman  on 2014-09-26

Change qtdeclarative5-dev to qtdeclarative5-dev-tools

375. By Dan Chapman  on 2014-09-26

Merge trunk