diff -Nru runit-2.1.2/debian/changelog runit-2.1.2/debian/changelog --- runit-2.1.2/debian/changelog 2016-12-09 11:37:37.000000000 +0000 +++ runit-2.1.2/debian/changelog 2017-11-16 05:36:59.000000000 +0000 @@ -1,3 +1,26 @@ +runit (2.1.2-9.2ubuntu1) bionic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Disable runit-systemv, the sysvinit-core runtime dependency + is not satisfiable on yakkety + + -- Dimitri John Ledkov Thu, 16 Nov 2017 05:35:40 +0000 + +runit (2.1.2-9.2) unstable; urgency=medium + + * non-maintainer upload + * re-add /sbin/runit{,-init} to runit package so it remains possible to + use runit as PID 1 + + -- Daniel Kahn Gillmor Wed, 31 May 2017 12:44:38 -0400 + +runit (2.1.2-9.1) unstable; urgency=medium + + * non-maintainer upload + * drop runit-init package (Closes: #861536) + + -- Daniel Kahn Gillmor Tue, 30 May 2017 11:46:28 -0400 + runit (2.1.2-9ubuntu2) zesty; urgency=medium * Remove runit-upstart, upstart as pid 1 has not been supported for a diff -Nru runit-2.1.2/debian/control runit-2.1.2/debian/control --- runit-2.1.2/debian/control 2016-12-09 11:37:13.000000000 +0000 +++ runit-2.1.2/debian/control 2017-11-16 05:36:47.000000000 +0000 @@ -7,17 +7,18 @@ Homepage: http://smarden.org/runit/ Build-Depends: bash-completion, debhelper (>= 9), - dh-exec, dh-systemd, dh-runit (>= 1.6), dh-buildinfo (>= 0.11+nmu1), - doc-base, + doc-base Vcs-Browser: https://anonscm.debian.org/cgit/users/kaction-guest/runit.git Vcs-Git: https://anonscm.debian.org/cgit/users/kaction-guest/runit.git Package: runit Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} +Breaks: runit-init +Replaces: runit-init Description: system-wide service supervision runit is a collection of tools to provide system-wide service supervision and to manage services. Contrary to sysv init, it not only cares about @@ -27,8 +28,8 @@ and a log facility with automatic log file rotation and disk space limits. . runit service supervision can run under sysv init or replace the init - system completely. Complete init replacement provided by 'runit-init' - package. + system completely. Complete init replacement needs to be done by hand + (see https://bugs.debian.org/861536) Package: runit-systemd Architecture: all @@ -73,19 +74,3 @@ . This package provides scripts to supervise getty processes, allowing local login. - -Package: runit-init -Architecture: any -Depends: runit (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, getty-run -Replaces: systemd-sysv, sysvinit (<< 2.88dsf-44~), sysvinit-core, upstart -Conflicts: systemd-sysv, sysvinit (<< 2.88dsf-44~), sysvinit-core, upstart -Priority: extra -Description: system-wide service supervision (as init system) - runit is a collection of tools to provide system-wide service supervision - and to manage services. Contrary to sysv init, it not only cares about - starting and stopping services, but also supervises the service daemons - while they are running. Amongst other things, it provides a reliable - interface to send signals to service daemons without the need for pid-files, - and a log facility with automatic log file rotation and disk space limits. - . - This package provides /sbin/init, that boots your system and starts runit. diff -Nru runit-2.1.2/debian/rules runit-2.1.2/debian/rules --- runit-2.1.2/debian/rules 2016-12-09 11:37:37.000000000 +0000 +++ runit-2.1.2/debian/rules 2017-06-02 22:36:57.000000000 +0000 @@ -9,11 +9,6 @@ override_dh_systemd_enable: dh_systemd_enable --name runit -override_dh_installman-arch: - dh_installman - mv debian/runit-init/usr/share/man/man8/runit-init.8 \ - debian/runit-init/usr/share/man/man8/init.8 - override_dh_runit: runscripts/getty dh_runit @@ -32,7 +27,7 @@ dh_clean override_dh_installchangelogs: dh_installchangelogs - dh_installchangelogs -p runit -p runit-init \ + dh_installchangelogs -p runit \ runit-$(DEB_VERSION_UPSTREAM)/package/CHANGES .PHONY: runscripts/getty diff -Nru runit-2.1.2/debian/runit-init.install runit-2.1.2/debian/runit-init.install --- runit-2.1.2/debian/runit-init.install 2016-10-12 00:21:28.000000000 +0000 +++ runit-2.1.2/debian/runit-init.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -#!/usr/bin/dh-exec -runit-2.1.2/src/runit-init => /sbin/init -runit-2.1.2/src/runit /sbin -debian/contrib/shutdown /sbin -debian/contrib/reboot /sbin -debian/contrib/runlevel /sbin diff -Nru runit-2.1.2/debian/runit-init.links runit-2.1.2/debian/runit-init.links --- runit-2.1.2/debian/runit-init.links 2016-10-09 10:17:37.000000000 +0000 +++ runit-2.1.2/debian/runit-init.links 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/usr/share/man/man8/shutdown.8.gz /usr/share/man/man8/reboot.8.gz diff -Nru runit-2.1.2/debian/runit-init.manpages runit-2.1.2/debian/runit-init.manpages --- runit-2.1.2/debian/runit-init.manpages 2016-10-12 00:21:28.000000000 +0000 +++ runit-2.1.2/debian/runit-init.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -runit-*/man/runit.8 -runit-*/man/runit-init.8 -debian/contrib/shutdown.8 -debian/contrib/runlevel.8 diff -Nru runit-2.1.2/debian/runit.install runit-2.1.2/debian/runit.install --- runit-2.1.2/debian/runit.install 2016-10-12 00:21:28.000000000 +0000 +++ runit-2.1.2/debian/runit.install 2017-06-02 22:36:57.000000000 +0000 @@ -8,7 +8,9 @@ runit-*/src/chpst /usr/bin runit-*/src/runsvchdir /usr/sbin runit-*/src/utmpset /usr/sbin +runit-*/src/runit-init /sbin +runit-*/src/runit /sbin runit-*/etc/debian/1 /etc/runit runit-*/etc/2 /etc/runit -runit-*/etc/debian/3 /etc/runit \ No newline at end of file +runit-*/etc/debian/3 /etc/runit diff -Nru runit-2.1.2/debian/runit.manpages runit-2.1.2/debian/runit.manpages --- runit-2.1.2/debian/runit.manpages 2016-10-12 00:21:28.000000000 +0000 +++ runit-2.1.2/debian/runit.manpages 2017-06-02 22:36:58.000000000 +0000 @@ -5,4 +5,6 @@ runit-*/man/chpst.8 runit-*/man/runsvchdir.8 runit-*/man/utmpset.8 +runit-*/man/runit.8 +runit-*/man/runit-init.8 debian/contrib/update-service.8 diff -Nru runit-2.1.2/debian/runit-upstart.conffiles runit-2.1.2/debian/runit-upstart.conffiles --- runit-2.1.2/debian/runit-upstart.conffiles 2016-08-23 12:24:00.000000000 +0000 +++ runit-2.1.2/debian/runit-upstart.conffiles 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/etc/init/runsvdir.conf