lp:~ted/ubuntu-app-launch/abstract-jobs

Branch merges

Merged into lp:ubuntu-app-launch at revision 276

Marcus Tomlinson: Approve on 2017-01-20

unity-api-1-bot: Needs Fixing (continuous-integration) on 2017-01-19

Diff: 3295 lines (+1693/-1289)

17 files modified

docs/index.rst (+40/-10)
libubuntu-app-launch/CMakeLists.txt (+4/-0)
libubuntu-app-launch/application-impl-base.cpp (+0/-787)
libubuntu-app-launch/application-impl-base.h (+0/-78)
libubuntu-app-launch/application-impl-click.cpp (+6/-19)
libubuntu-app-launch/application-impl-legacy.cpp (+6/-32)
libubuntu-app-launch/application-impl-libertine.cpp (+6/-15)
libubuntu-app-launch/application-impl-snap.cpp (+6/-17)
libubuntu-app-launch/application.cpp (+7/-0)
libubuntu-app-launch/jobs-base.cpp (+389/-0)
libubuntu-app-launch/jobs-base.h (+119/-0)
libubuntu-app-launch/jobs-upstart.cpp (+988/-0)
libubuntu-app-launch/jobs-upstart.h (+75/-0)
libubuntu-app-launch/registry-impl.cpp (+1/-246)
libubuntu-app-launch/registry-impl.h (+3/-15)
libubuntu-app-launch/registry.cpp (+7/-53)
tests/libual-cpp-test.cc (+36/-17)

api

Superseded for merging into lp:ubuntu-app-launch/16.10

Unity API Team: Pending requested 2016-10-26

Diff: 6212 lines (+3149/-2127)

34 files modified

docs/index.rst (+40/-10)
libubuntu-app-launch/CMakeLists.txt (+4/-0)
libubuntu-app-launch/application-impl-base.cpp (+0/-766)
libubuntu-app-launch/application-impl-base.h (+0/-69)
libubuntu-app-launch/application-impl-click.cpp (+6/-19)
libubuntu-app-launch/application-impl-legacy.cpp (+6/-32)
libubuntu-app-launch/application-impl-libertine.cpp (+7/-17)
libubuntu-app-launch/application-impl-snap.cpp (+6/-17)
libubuntu-app-launch/application.cpp (+7/-0)
libubuntu-app-launch/jobs-base.cpp (+392/-0)
libubuntu-app-launch/jobs-base.h (+117/-0)
libubuntu-app-launch/jobs-upstart.cpp (+899/-0)
libubuntu-app-launch/jobs-upstart.h (+75/-0)
libubuntu-app-launch/libubuntu-app-launch.map (+1/-0)
libubuntu-app-launch/registry-impl.cpp (+494/-264)
libubuntu-app-launch/registry-impl.h (+78/-25)
libubuntu-app-launch/registry.cpp (+47/-54)
libubuntu-app-launch/registry.h (+120/-14)
libubuntu-app-launch/ubuntu-app-launch.cpp (+339/-413)
tests/CMakeLists.txt (+1/-0)
tests/failure-test.cc (+123/-96)
tests/libual-cpp-test.cc (+186/-141)
tools/CMakeLists.txt (+21/-2)
tools/ubuntu-app-info.cpp (+18/-9)
tools/ubuntu-app-launch.cpp (+56/-68)
tools/ubuntu-app-list-pids.cpp (+7/-3)
tools/ubuntu-app-list.cpp (+1/-1)
tools/ubuntu-app-pid.cpp (+8/-4)
tools/ubuntu-app-stop.cpp (+7/-3)
tools/ubuntu-app-triplet.cpp (+1/-1)
tools/ubuntu-app-watch.cpp (+61/-88)
tools/ubuntu-helper-list.cpp (+1/-1)
tools/ubuntu-helper-start.cpp (+10/-5)
tools/ubuntu-helper-stop.cpp (+10/-5)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

280. By Ted Gould on 2017-01-19

Update to trunk

279. By Ted Gould on 2017-01-11

Merging app signals branch

278. By Ted Gould on 2016-11-17

Migrate tests to use pause/resume c++ signals

277. By Ted Gould on 2016-11-17

Merging through trunk

276. By Ted Gould on 2016-11-14

Updated tests

275. By Ted Gould on 2016-11-11

Merge fail

274. By Ted Gould on 2016-11-11

Merging in app object changes

273. By Ted Gould on 2016-11-07

Merge in the app object signals branch

272. By Ted Gould on 2016-10-27

Make sure to grab numeric header as well

271. By Ted Gould on 2016-10-13

Merge trunk