[Merge] lp:~xnox/ubuntu/utopic/upstart/core-split into lp:ubuntu/upstart

Mon Aug 4 13:02:48 UTC 2014

Review: Needs Fixing

Ah, thanks for the conffile heads-up. I seem to remember that changed conffiles cause dpkg conffile prompts if they don't get migrated properly (in all times that I looked at moving conffiles I had to add dpkg-maintscript-helper), but if you tested that changed conffiles are being handled correctly now, that's fine.

I built the branch and did a binary debdiff review:

The manpages for init, telinit, restart etc. went to -bin, but I believe they should stay in "upstart" to avoid a potential conflict?

/var/log/upstart/ should also stay in "upstart".

One emergent issue for renaming the apport hook (see inline comment).

Otherwise, LGTM.

Diff comments:

> === modified file 'debian/changelog'
> --- debian/changelog	2014-07-28 10:23:11 +0000
> +++ debian/changelog	2014-08-04 12:12:14 +0000
> @@ -1,3 +1,9 @@
> +upstart (1.13.1-0ubuntu3) UNRELEASED; urgency=medium
> +
> +  * Split upstart package into upstart & upstart-bin. (LP: #1351306)
> +
> + -- Dimitri John Ledkov <xnox at ubuntu.com>  Sun, 03 Aug 2014 18:28:09 +0100
> +
>  upstart (1.13.1-0ubuntu2) utopic; urgency=medium
>  
>    * Cherry-pick cgmanager text fix from upstream.
> 
> === modified file 'debian/control'
> --- debian/control	2014-06-05 18:04:53 +0000
> +++ debian/control	2014-08-04 12:12:14 +0000
> @@ -15,17 +15,34 @@
>  
>  Package: upstart
>  Architecture: any
> -Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, initscripts, mountall, ifupdown (>= 0.6.10ubuntu5), libjson0 (>= 0.10-1.1ubuntu1), debianutils (>= 4)
> +Depends: upstart-bin (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, initscripts, mountall, ifupdown (>= 0.6.10ubuntu5), libjson0 (>= 0.10-1.1ubuntu1), debianutils (>= 4)
>  Suggests: python3, graphviz, bash-completion, upstart-monitor
>  Replaces: upstart-job, sysvinit, upstart-compat-sysv, startup-tasks, system-services
>  Conflicts: upstart-job, sysvinit, upstart-compat-sysv, startup-tasks, system-services, lxcguest
>  Provides: upstart-job, upstart-compat-sysv, startup-tasks, system-services
> -Breaks: libc6 (<< 2.12.1-0ubuntu12), friendly-recovery (<< 0.2.13)
> -Multi-Arch: foreign
> -Description: event-based init daemon
> - upstart is a replacement for the /sbin/init daemon which handles
> - starting of tasks and services during boot, stopping them during
> - shutdown and supervising them while the system is running.
> +Breaks: libc6 (<< 2.12.1-0ubuntu12), friendly-recovery (<< 0.2.13), initramfs-tools (<< 0.103ubuntu8)
> +Multi-Arch: foreign
> +Description: event-based init daemon - sysv compat
> + upstart is a replacement for the /sbin/init daemon which handles
> + starting of tasks and services during boot, stopping them during
> + shutdown and supervising them while the system is running.
> + .
> + This package provides sysv compatible binaries.
> +
> +Package: upstart-bin
> +Architecture: any
> +Depends: ${shlibs:Depends}, ${misc:Depends}, sysvinit-utils, initscripts, libjson0 (>= 0.10-1.1ubuntu1), debianutils (>= 4)
> +Suggests: python3, graphviz, bash-completion, upstart-monitor
> +Replaces: upstart (<= 1.13.1-0ubuntu2)
> +Breaks: upstart (<= 1.13.1-0ubuntu2)
> +Multi-Arch: foreign
> +Description: event-based init daemon - essential binaries
> + upstart is a replacement for the /sbin/init daemon which handles
> + starting of tasks and services during boot, stopping them during
> + shutdown and supervising them while the system is running.
> + . 
> + This package provides all essential upstart components, sufficient
> + for running user sessions managed by upstart.
>  
>  Package: upstart-monitor
>  Architecture: all
> 
> === modified file 'debian/rules'
> --- debian/rules	2013-11-30 07:02:51 +0000
> +++ debian/rules	2014-08-04 12:12:14 +0000
> @@ -19,7 +19,8 @@
>  
>  override_dh_auto_configure:
>  	dh_auto_configure -- --exec-prefix= --enable-selinux \
> -		--disable-silent-rules --disable-abi-check
> +		--disable-silent-rules --disable-abi-check \
> +		--program-transform-name="s/^init$$/upstart/"
>  
>  override_dh_auto_build:
>  	dh_auto_build --parallel
> @@ -37,9 +38,9 @@
>  
>  override_dh_fixperms:
>  	dh_fixperms
> -	chmod 755 debian/upstart/lib/init/upstart-job
> -	chmod 755 debian/upstart/lib/init/apparmor-profile-load
> -	chmod 755 debian/upstart/usr/lib/upstart/migrate-inittab.pl
> +	chmod 755 debian/upstart-bin/lib/init/upstart-job
> +	chmod 755 debian/upstart-bin/lib/init/apparmor-profile-load
> +	chmod 755 debian/upstart-bin/usr/lib/upstart/migrate-inittab.pl
>  
>  override_dh_auto_install:
>  	dh_auto_install -- pkgconfigdir=\$${libdir}/pkgconfig
> @@ -48,10 +49,9 @@
>  # will be added used by the upstart-dconf-bridge.install file.
>  override_dh_install:
>  	dh_install
> -	install -m 644 debian/upstart.apport \
> -		debian/upstart/usr/share/apport/package-hooks/upstart.py
> -	rm debian/upstart/sbin/upstart-dconf-bridge
> -	rm debian/upstart/usr/share/upstart/sessions/upstart-dconf-bridge.conf
> +	install -m 644 debian/upstart-bin.apport \
> +		debian/upstart-bin/usr/share/apport/package-hooks/upstart.py

I recommend changing that to .../package-hooks/source_upstart.py, so that it applies to both upstart and upstart-bin.

> +	rm debian/upstart-bin/usr/share/upstart/sessions/upstart-dconf-bridge.conf
>  	rm debian/upstart/etc/init/upstart-event-bridge.conf
>  	rm debian/upstart/etc/init/upstart-dbus-bridge.conf
>  
> @@ -62,6 +62,9 @@
>  # .manpages file.
>  override_dh_installman:
>  	dh_installman
> -	rm debian/upstart/usr/share/man/man8/upstart-monitor.8*
> -	rm debian/upstart/usr/share/man/man8/upstart-dconf-bridge.8*
> -	rm debian/upstart/usr/share/man/man7/dconf-event.7*
> +	rm debian/upstart-bin/usr/share/man/man8/upstart-monitor.8*
> +	rm debian/upstart-bin/usr/share/man/man8/upstart-dconf-bridge.8*
> +	rm debian/upstart-bin/usr/share/man/man7/dconf-event.7*
> +
> +override_dh_installcron:
> +	dh_installcron -p upstart-bin --name upstart
> 
> === renamed file 'debian/upstart.apport' => 'debian/upstart-bin.apport'
> === renamed file 'debian/upstart.bash-completion' => 'debian/upstart-bin.bash-completion'
> === renamed file 'debian/upstart.dirs' => 'debian/upstart-bin.dirs'
> === renamed file 'debian/upstart.docs' => 'debian/upstart-bin.docs'
> === renamed file 'debian/upstart.install' => 'debian/upstart-bin.install'
> --- debian/upstart.install	2014-05-27 14:14:59 +0000
> +++ debian/upstart-bin.install	2014-08-04 12:12:14 +0000
> @@ -1,9 +1,19 @@
> -debian/conf/*.conf etc/init/
> -etc/init/*.conf
> -etc/dbus-1/system.d/Upstart.conf
>  bin/init-checkconf usr/bin/
>  bin/initctl2dot usr/bin/
> -sbin/*
> +sbin/initctl
> +sbin/telinit lib/sysvinit/
> +sbin/reload
> +sbin/restart
> +sbin/start
> +sbin/status
> +sbin/stop
> +sbin/upstart
> +sbin/upstart-dbus-bridge
> +sbin/upstart-event-bridge
> +sbin/upstart-file-bridge
> +sbin/upstart-local-bridge
> +sbin/upstart-socket-bridge
> +sbin/upstart-udev-bridge
>  debian/upstart-job lib/init/
>  debian/apparmor-profile-load lib/init/
>  debian/migrate-inittab.pl usr/lib/upstart/
> 
> === renamed file 'debian/upstart.maintscript' => 'debian/upstart-bin.maintscript'
> === renamed file 'debian/upstart.manpages' => 'debian/upstart-bin.manpages'
> === renamed file 'debian/upstart.postinst' => 'debian/upstart-bin.postinst'
> === renamed file 'debian/upstart.cron.daily' => 'debian/upstart-bin.upstart.cron.daily'
> === added file 'debian/upstart.install'
> --- debian/upstart.install	1970-01-01 00:00:00 +0000
> +++ debian/upstart.install	2014-08-04 12:12:14 +0000
> @@ -0,0 +1,8 @@
> +debian/conf/*.conf etc/init/
> +etc/init/*.conf
> +etc/dbus-1/system.d/Upstart.conf
> +/sbin/halt
> +/sbin/poweroff
> +/sbin/reboot
> +/sbin/runlevel
> +/sbin/shutdown
> 
> === added file 'debian/upstart.links'
> --- debian/upstart.links	1970-01-01 00:00:00 +0000
> +++ debian/upstart.links	2014-08-04 12:12:14 +0000
> @@ -0,0 +1,2 @@
> +sbin/upstart sbin/init
> +lib/sysvinit/telinit sbin/telinit
> 

-- 
https://code.launchpad.net/~xnox/ubuntu/utopic/upstart/core-split/+merge/229431
Your team Ubuntu branches is requested to review the proposed merge of lp:~xnox/ubuntu/utopic/upstart/core-split into lp:ubuntu/upstart.