summaryrefslogtreecommitdiffstats
path: root/debian/systemd.manpages
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-25 02:55:10 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-25 02:55:29 +0000
commite8c534373c6e551596ead9d792dafb02eeef0d9d (patch)
tree633dadcbf7635c88c571c2fdcbed079049b821ab /debian/systemd.manpages
parentMerging upstream version 255.5. (diff)
downloadsystemd-e8c534373c6e551596ead9d792dafb02eeef0d9d.tar.xz
systemd-e8c534373c6e551596ead9d792dafb02eeef0d9d.zip
Merging debian version 255.5-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/systemd.manpages')
-rwxr-xr-xdebian/systemd.manpages7
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/systemd.manpages b/debian/systemd.manpages
index caccf5a..66104de 100755
--- a/debian/systemd.manpages
+++ b/debian/systemd.manpages
@@ -5,6 +5,7 @@ debian/tmp/usr/share/man/man1/journalctl.1
debian/tmp/usr/share/man/man1/localectl.1
debian/tmp/usr/share/man/man1/loginctl.1
debian/tmp/usr/share/man/man1/networkctl.1
+<pkg.systemd.upstream> debian/tmp/usr/share/man/man1/run0.1
debian/tmp/usr/share/man/man1/systemctl.1
debian/tmp/usr/share/man/man1/systemd.1
debian/tmp/usr/share/man/man1/systemd-ac-power.1
@@ -23,7 +24,8 @@ debian/tmp/usr/share/man/man1/systemd-firstboot.service.1
debian/tmp/usr/share/man/man1/systemd-id128.1
debian/tmp/usr/share/man/man1/systemd-inhibit.1
debian/tmp/usr/share/man/man1/systemd-machine-id-setup.1
-[amd64 i386 arm64 armhf riscv64] <!stage1> debian/tmp/usr/share/man/man1/systemd-measure.1
+[amd64 i386 arm64 armhf riscv64] <!stage1 !pkg.systemd.upstream> debian/tmp/usr/share/man/man1/systemd-measure.1
+<pkg.systemd.upstream> debian/tmp/usr/share/man/man1/systemd-measure.1
debian/tmp/usr/share/man/man1/systemd-mount.1
debian/tmp/usr/share/man/man1/systemd-notify.1
debian/tmp/usr/share/man/man1/systemd-path.1
@@ -35,9 +37,9 @@ debian/tmp/usr/share/man/man1/systemd-tty-ask-password-agent.1
debian/tmp/usr/share/man/man1/systemd-umount.1
<pkg.systemd.upstream> debian/tmp/usr/share/man/man1/systemd-vpick.1
debian/tmp/usr/share/man/man1/timedatectl.1
-<pkg.systemd.upstream> debian/tmp/usr/share/man/man1/uid0.1
debian/tmp/usr/share/man/man1/varlinkctl.1
debian/tmp/usr/share/man/man5/binfmt.d.5
+<pkg.systemd.upstream> debian/tmp/usr/share/man/man5/capsule@.service.5
debian/tmp/usr/share/man/man5/dnssec-trust-anchors.d.5
debian/tmp/usr/share/man/man5/environment.d.5
debian/tmp/usr/share/man/man5/extension-release.5
@@ -167,6 +169,7 @@ debian/tmp/usr/share/man/man8/systemd-growfs.8
debian/tmp/usr/share/man/man8/systemd-growfs-root.service.8
debian/tmp/usr/share/man/man8/systemd-growfs@.service.8
debian/tmp/usr/share/man/man8/systemd-halt.service.8
+<pkg.systemd.upstream> debian/tmp/usr/share/man/man8/systemd-hibernate-clear.service.8
debian/tmp/usr/share/man/man8/systemd-hibernate-resume.8
debian/tmp/usr/share/man/man8/systemd-hibernate-resume-generator.8
debian/tmp/usr/share/man/man8/systemd-hibernate-resume.service.8