diff -Nru init-system-helpers-1.59/debian/changelog init-system-helpers-1.60/debian/changelog --- init-system-helpers-1.59/debian/changelog 2020-11-19 22:35:09.000000000 +0000 +++ init-system-helpers-1.60/debian/changelog 2020-12-14 20:19:00.000000000 +0000 @@ -1,3 +1,14 @@ +init-system-helpers (1.60) unstable; urgency=medium + + * deb-systemd-*, update-rc.d: Don't hard-code path to systemctl binary. + This should simplify an eventual move of systemctl from /bin to /usr/bin. + * Switch to debhelper-compat and bump compat level to 13 + * Bump Standards-Version to 4.5.1 + * Drop obsolete Breaks/Replaces and Conflicts + * Remove init-system-helpers.lintian-overrides, no longer needed + + -- Michael Biebl Mon, 14 Dec 2020 21:19:00 +0100 + init-system-helpers (1.59) unstable; urgency=medium * invoke-rc.d: Remove unnecessary systemctl daemon-reload. diff -Nru init-system-helpers-1.59/debian/compat init-system-helpers-1.60/debian/compat --- init-system-helpers-1.59/debian/compat 2020-11-19 22:35:09.000000000 +0000 +++ init-system-helpers-1.60/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru init-system-helpers-1.59/debian/control init-system-helpers-1.60/debian/control --- init-system-helpers-1.59/debian/control 2020-11-19 22:35:09.000000000 +0000 +++ init-system-helpers-1.60/debian/control 2020-12-14 20:19:00.000000000 +0000 @@ -5,10 +5,10 @@ Uploaders: Michael Biebl , Martin Pitt , Felipe Sateler -Build-Depends: debhelper (>= 11), +Build-Depends: debhelper-compat (= 13), perl:any, python3-docutils -Standards-Version: 4.2.1 +Standards-Version: 4.5.1 Vcs-Git: https://salsa.debian.org/debian/init-system-helpers.git Vcs-Browser: https://salsa.debian.org/debian/init-system-helpers @@ -20,15 +20,7 @@ Depends: perl-base (>= 5.20.1-3), ${misc:Depends}, ${perl:Depends}, -Replaces: sysv-rc (<< 2.88dsf-59.3~), - sysvinit-utils (<< 2.88dsf-59.3), -# sysv-rc now pre-depends on us and if we break them we get: -# E: This installation run will require temporarily removing the essential package sysvinit-utils:amd64 due to a Conflicts/Pre-Depends loop. This is often bad, but if you really want to do it, activate the APT::Force-LoopBreak option. -#Breaks: sysv-rc (<< 2.88dsf-59.3~) -Breaks: systemd (<< 228), - sysvinit-utils (<< 2.88dsf-59.3~), Conflicts: file-rc (<< 0.8.17~), - openrc (<= 0.18.3-1), Description: helper tools for all init systems This package contains helper tools that are necessary for switching between the various init systems that Debian contains (e. g. sysvinit or diff -Nru init-system-helpers-1.59/debian/init-system-helpers.lintian-overrides init-system-helpers-1.60/debian/init-system-helpers.lintian-overrides --- init-system-helpers-1.59/debian/init-system-helpers.lintian-overrides 2020-11-19 22:35:09.000000000 +0000 +++ init-system-helpers-1.60/debian/init-system-helpers.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# The upstream command is called “systemctl reenable”, so we cannot just -# rename it to “re-enable” :). -init-system-helpers: spelling-error-in-manpage usr/share/man/man1/deb-systemd-helper.1p.gz reenable re-enable diff -Nru init-system-helpers-1.59/script/deb-systemd-helper init-system-helpers-1.60/script/deb-systemd-helper --- init-system-helpers-1.59/script/deb-systemd-helper 2020-11-19 22:35:09.000000000 +0000 +++ init-system-helpers-1.60/script/deb-systemd-helper 2020-12-14 20:19:00.000000000 +0000 @@ -105,7 +105,7 @@ # Globals are bad, but in this specific case, it really makes things much # easier to write and understand. my $changed_sth; -my $has_systemctl = -x "/bin/systemctl"; +my $has_systemctl = -x "/bin/systemctl" || -x "/usr/bin/systemctl"; sub error { print STDERR "$0: error: @_\n"; @@ -268,7 +268,7 @@ $create_links = 1 unless no_link_installed($scriptname, $service_path); } else { debug "Using systemctl preset to enable $scriptname"; - system("/bin/systemctl", + system("systemctl", $instance eq "user" ? "--global" : "--system", "--preset-mode=enable-only", "preset", $scriptname) == 0 diff -Nru init-system-helpers-1.59/script/deb-systemd-invoke init-system-helpers-1.60/script/deb-systemd-invoke --- init-system-helpers-1.59/script/deb-systemd-invoke 2020-11-19 22:35:09.000000000 +0000 +++ init-system-helpers-1.60/script/deb-systemd-invoke 2020-12-14 20:19:00.000000000 +0000 @@ -86,12 +86,12 @@ my @start_units = (); for my $unit (@units) { my $unit_installed = 0; - my $enabled_output = `/bin/systemctl is-enabled -- '$unit'`; + my $enabled_output = `systemctl is-enabled -- '$unit'`; # matching enabled and enabled-runtime as an installed non static unit if ($enabled_output =~ /enabled/) { $unit_installed = 1; } - system('/bin/systemctl', '--quiet', 'is-active', '--', $unit); + system('systemctl', '--quiet', 'is-active', '--', $unit); my $unit_active = $?>>8 == 0 ? 1 : 0; if (!$unit_installed && $action eq "start") { print STDERR "$unit is a disabled or a static unit, not starting it.\n"; @@ -103,9 +103,9 @@ } } if (@start_units) { - exec('/bin/systemctl', $action, @start_units) or die("Could not execute systemctl: $!"); + exec('systemctl', $action, @start_units) or die("Could not execute systemctl: $!"); } exit(0); } else { - exec '/bin/systemctl', @ARGV; + exec('systemctl', @ARGV); } diff -Nru init-system-helpers-1.59/script/update-rc.d init-system-helpers-1.60/script/update-rc.d --- init-system-helpers-1.59/script/update-rc.d 2020-11-19 22:35:09.000000000 +0000 +++ init-system-helpers-1.60/script/update-rc.d 2020-12-14 20:19:00.000000000 +0000 @@ -136,7 +136,7 @@ } # If systemctl is available, let's use that to create the symlinks. - if (-x "/bin/systemctl") { + if (-x "/bin/systemctl" || -x "/usr/bin/systemctl") { # Set this env var to avoid loop in systemd-sysv-install. local $ENV{SYSTEMCTL_SKIP_SYSV} = 1; # Use --quiet to mimic the old update-rc.d behaviour.