Ubuntu
upstart package

Merge lp://qastaging/~jamesodhunt/ubuntu/saucy/upstart/1.9.1 into lp://qastaging/ubuntu/saucy/upstart

  1. Saucy (13.10)
  2. 1.9.1
  3. Merge into saucy
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 1480
Proposed branch: lp://qastaging/~jamesodhunt/ubuntu/saucy/upstart/1.9.1
Merge into: lp://qastaging/ubuntu/saucy/upstart
Diff against target: 33646 lines (+1118/-29511)
118 files modified
ChangeLog (+27/-0)
Makefile.am (+1/-1)
Makefile.in (+11/-52)
NEWS (+9/-0)
aclocal.m4 (+0/-19)
conf/Makefile.in (+6/-44)
config.h.in (+2/-270)
configure (+292/-3317)
configure.ac (+4/-4)
contrib/Makefile.in (+6/-44)
dbus/Makefile.in (+6/-44)
debian/changelog (+13/-2)
debian/control (+26/-1)
debian/copyright (+1/-1)
debian/libupstart-dev.install (+5/-0)
debian/libupstart1.install (+1/-0)
debian/libupstart1.symbols (+2/-0)
debian/rules (+6/-0)
debian/upstart.postinst (+5/-0)
doc/Makefile.in (+6/-44)
extra/Makefile.in (+6/-44)
init/Makefile.in (+105/-489)
init/tests/libwrap_inotify.la (+0/-41)
intl/ChangeLog (+0/-4)
intl/Makefile.in (+0/-587)
intl/VERSION (+0/-1)
intl/bindtextdom.c (+0/-340)
intl/config.charset (+0/-640)
intl/dcgettext.c (+0/-56)
intl/dcigettext.c (+0/-1689)
intl/dcngettext.c (+0/-57)
intl/dgettext.c (+0/-58)
intl/dngettext.c (+0/-59)
intl/eval-plural.h (+0/-108)
intl/explodename.c (+0/-135)
intl/export.h (+0/-6)
intl/finddomain.c (+0/-212)
intl/gettext.c (+0/-63)
intl/gettextP.h (+0/-297)
intl/gmo.h (+0/-152)
intl/hash-string.c (+0/-51)
intl/hash-string.h (+0/-36)
intl/intl-compat.c (+0/-133)
intl/intl-exports.c (+0/-36)
intl/l10nflist.c (+0/-400)
intl/langprefs.c (+0/-130)
intl/libgnuintl.h.in (+0/-419)
intl/libintl.rc (+0/-38)
intl/loadinfo.h (+0/-132)
intl/loadmsgcat.c (+0/-1336)
intl/localcharset.c (+0/-461)
intl/localcharset.h (+0/-42)
intl/locale.alias (+0/-77)
intl/localealias.c (+0/-439)
intl/localename.c (+0/-1507)
intl/lock.c (+0/-922)
intl/lock.h (+0/-1105)
intl/log.c (+0/-116)
intl/ngettext.c (+0/-65)
intl/os2compat.c (+0/-98)
intl/os2compat.h (+0/-46)
intl/osdep.c (+0/-26)
intl/plural-exp.c (+0/-155)
intl/plural-exp.h (+0/-129)
intl/plural.c (+0/-1961)
intl/plural.y (+0/-385)
intl/printf-args.c (+0/-188)
intl/printf-args.h (+0/-155)
intl/printf-parse.c (+0/-590)
intl/printf-parse.h (+0/-75)
intl/printf.c (+0/-427)
intl/ref-add.sin (+0/-31)
intl/ref-del.sin (+0/-26)
intl/relocatable.c (+0/-468)
intl/relocatable.h (+0/-79)
intl/textdomain.c (+0/-127)
intl/tsearch.c (+0/-684)
intl/tsearch.h (+0/-83)
intl/vasnprintf.c (+0/-4677)
intl/vasnprintf.h (+0/-78)
intl/vasnwprintf.h (+0/-46)
intl/version.c (+0/-26)
intl/wprintf-parse.h (+0/-75)
intl/xsize.h (+0/-109)
lib/Makefile.am (+37/-10)
lib/Makefile.in (+229/-398)
lib/libupstart.la (+0/-41)
lib/libupstart.pc.in.in (+1/-1)
lib/tests/test_libupstart.c (+0/-2)
lib/upstart.h (+4/-3)
ltmain.sh (+2/-2)
m4/codeset.m4 (+0/-21)
m4/glibc2.m4 (+0/-30)
m4/glibc21.m4 (+0/-30)
m4/intdiv0.m4 (+0/-84)
m4/intl.m4 (+0/-285)
m4/intmax.m4 (+0/-33)
m4/inttypes-pri.m4 (+0/-36)
m4/inttypes_h.m4 (+0/-26)
m4/lcmessage.m4 (+0/-30)
m4/lock.m4 (+0/-316)
m4/longlong.m4 (+0/-109)
m4/printf-posix.m4 (+0/-44)
m4/size_max.m4 (+0/-68)
m4/stdint_h.m4 (+0/-26)
m4/uintmax_t.m4 (+0/-30)
m4/visibility.m4 (+0/-52)
m4/wchar_t.m4 (+0/-20)
m4/wint_t.m4 (+0/-28)
m4/xsize.m4 (+0/-13)
po/en@boldquot.po (+55/-55)
po/en@quot.po (+55/-55)
po/upstart.pot (+60/-60)
scripts/Makefile.in (+6/-44)
scripts/data/Makefile.in (+6/-44)
scripts/initctl2dot.py (+15/-11)
test/Makefile.in (+6/-44)
util/Makefile.in (+102/-390)
To merge this branch: bzr merge lp://qastaging/~jamesodhunt/ubuntu/saucy/upstart/1.9.1
Reviewer Review Type Date Requested Status
Dimitri John Ledkov (community) Approve
James Hunt (community) Needs Resubmitting
Ubuntu branches Pending
Review via email: mp+173221@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Argh... launchpad lost my review. Will retype in a moment.

review: Needs Fixing
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

* I noticed SELINUX support is in ubuntu branch, but not
  upstream. Yet, apparmor support is upstream. Is SELINUX not needed
  upstream?

* libupstart1 control:
  One shouldn't normally use Pre-Depends, typically one uses
  Depends. Pre-Depends are used only in very unusual circumstances
  when additional guarantees are needed (all dependencies configured
  before this package is unpacked). Instead the fields should look
  like:

  Pre-Depends: $(misc:Pre-Depends)
  Depends: $(misc:Depends), $(shlibs:Depends)

  There is no need to list libnih-dbus1 dependancy, as the correct one
  is already genereated by shlibs:Depends, see libupstart1.substvars:
  "shlibs:Depends=libc6 (>= 2.2.5), libdbus-1-3 (>= 1.2.16), libnih-dbus1 (>= 1.0.0), libnih1 (>= 1.0.0)"

* upstart-dbus-bridge.conf removal:

  Since it's a conffile, it will not be automatically removed from
  disk by dpkg, such that upgrading to this version of upstart will
  keep that file. Thus it needs to be properly removed as done with
  dbus-reconnect.conf in upstart postinst,postrm,preinst. Instead of
  the "old" way of doing it, it's now possible to use
  dpkg-maintscript-helper instead.

* Incomplete Multi-Arch:
  Packages marked as Multi-Arch, clashing files must be identical, if
  they are different they should be shipped in arch-qualified
  locations. One file /usr/lib/pkgconfig/libupstart.pc is different across architectures:
  -libdir=${prefix}/lib/x86_64-linux-gnu
  +libdir=${prefix}/lib/i386-linux-gnu
  Thus it should be instead shipped in /usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig

review: Needs Fixing
lp://qastaging/~jamesodhunt/ubuntu/saucy/upstart/1.9.1 updated
1477. By James Hunt

* debian/control: Simplify dependencies and avoid hard-coding those
  which can be auto-generated.
* debian/rules: Install libupstart.pc to correct multi-arch location.
* debian/upstart.postinst: Handle safe removal of
  upstart-dbus-bridge.conf (which is not used at the system level).

1478. By James Hunt

debian/control: Add build-depends on automake >= 1.12 for serial-tests
in configure.ac (LP: #1197529).

1479. By James Hunt

debian/control: Correct automake relation.

1480. By James Hunt

debian/libupstart-dev.install: Specify wildcarded path (for multi-arch).

Revision history for this message
James Hunt (jamesodhunt) wrote :

Branch updated.

review: Needs Resubmitting
Revision history for this message
James Hunt (jamesodhunt) wrote :

Oh - and yes of course we *do* want to support SELinux upstream: slangasek is handling this as a separate activity I believe.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

* I think we do need to override dh_makeshlibs call and specify wanted version number (1.9.1) similar to libnih, since at the moment the symbols ended up to be over-versioned =)

libupstart.so.1 libupstart1 #MINVER#
 LIBUPSTART_1.0.0@LIBUPSTART_1.0.0 1.9.1-0ubuntu1
 job_class_com_ubuntu_Upstart0_6_Job@LIBUPSTART_1.0.0 1.9.1-0ubuntu1
 job_class_get_all@LIBUPSTART_1.0.0 1.9.1-0ubuntu1
 job_class_get_all_instances@LIBUPSTART_1.0.0 1.9.1-0ubuntu1
 job_class_get_all_instances_sync@LIBUPSTART_1.0.0 1.9.1-0ubuntu1
 job_class_get_all_sync@LIBUPSTART_1.0.0 1.9.1-0ubuntu1
 job_class_get_author@LIBUPSTART_1.0.0 1.9.1-0ubuntu1
 job_class_get_author_sync@LIBUPSTART_1.0.0 1.9.1-0ubuntu1
....

* dpkg-maintainer-helper to remove the config file needs to also be called in upstart.preinst and upstart.postrm.

Otherwise looks good. I guess it's ok to merge this branch now, but above two issues need to be fixed up. You or me can do that on lp:ubuntu/upstart directly.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: