lp:~jamesodhunt/ubuntu/oneiric/upstart/1.3

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/oneiric/upstart at revision 1317

Colin Watson: Pending requested 2011-06-17

Diff: 11841 lines (+2785/-3932)

64 files modified

ChangeLog (+410/-435)
NEWS (+67/-98)
TESTING.sessions (+263/-0)
TODO (+1/-7)
configure (+16/-16)
configure.ac (+4/-4)
contrib/bash_completion/upstart (+65/-29)
contrib/vim/syntax/upstart.vim (+61/-22)
debian/changelog (+21/-0)
extra/Makefile.am (+0/-1)
extra/conf/upstart-socket-bridge.conf (+0/-16)
extra/man/socket-event.7 (+0/-92)
extra/man/upstart-socket-bridge.8 (+0/-47)
extra/upstart-socket-bridge.c (+1/-1)
init/Makefile.am (+0/-13)
init/Makefile.in (+246/-306)
init/conf.c (+10/-8)
init/conf.h (+1/-1)
init/control.c (+2/-2)
init/control.h (+1/-1)
init/environ.c (+1/-57)
init/environ.h (+0/-1)
init/errors.h (+4/-1)
init/event.c (+2/-1)
init/job.c (+1/-1)
init/job_class.c (+6/-4)
init/job_class.h (+4/-2)
init/job_process.c (+86/-31)
init/job_process.h (+13/-2)
init/main.c (+95/-20)
init/man/init.5 (+58/-10)
init/man/init.8 (+3/-4)
init/parse_job.c (+69/-17)
init/parse_job.h (+1/-1)
init/paths.h (+9/-20)
init/session.c (+1/-1)
init/session.h (+1/-1)
init/system.c (+5/-11)
init/system.h (+1/-1)
init/tests/test_conf.c (+146/-0)
init/tests/test_control.c (+0/-38)
init/tests/test_environ.c (+0/-107)
init/tests/test_job_class.c (+5/-4)
init/tests/test_job_process.c (+10/-26)
init/tests/test_parse_job.c (+409/-8)
init/tests/test_system.c (+3/-3)
po/ChangeLog (+8/-0)
po/POTFILES.in (+1/-0)
po/en@boldquot.po (+211/-142)
po/en@quot.po (+211/-142)
po/upstart.pot (+209/-140)
scripts/Makefile.am (+0/-25)
scripts/Makefile.in (+0/-543)
scripts/init-checkconf.sh (+0/-248)
scripts/initctl2dot.py (+0/-571)
scripts/man/init-checkconf.8 (+0/-73)
scripts/man/initctl2dot.8 (+0/-87)
util/Makefile.am (+10/-0)
util/Makefile.in (+15/-4)
util/initctl.c (+6/-20)
util/initctl.h (+0/-458)
util/man/initctl.8 (+7/-4)
util/reboot.c (+1/-0)
util/tests/test_initctl.c (+4/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1319. By James Hunt on 2011-06-17

init/paths.h: Syned with upstream since Ubuntu file appears to have
diff applied twice, causing redefines.

1318. By James Hunt on 2011-06-17

init/Makefile.am: Sync up from upstream, dropping TEST define which is
no longer required now we set UPSTART_NO_SESSIONS for init/tests/*.c
and specify "--no-sessions" for util/tests/*.c.

1317. By James Hunt on 2011-06-16

Merge of Upstart 1.3 (lp:upstart @ 1.3 release tag).

1316. By Stéphane Graber on 2011-05-25

Merge checkconf fixes from James

1315. By Steve Langasek on 2011-05-25

null-merge upstream 0.9.7

1314. By Clint Byrum on 2011-05-04

Add wait-for-state generic "wait job".

1313. By Colin Watson on 2011-04-20

sync up some generated files with tarball (bis)

1312. By Colin Watson on 2011-04-20

sync up some generated files with tarball

1311. By Colin Watson on 2011-04-20

merge lp:~jamesodhunt/ubuntu/natty/upstart/fix-for-bug-767053

1310. By Clint Byrum on 2011-04-20

Noting bugs fixed by 0.9.6 release of upstart: (LP: #728531 , LP: #766206)