23 files changed, 1554 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 0c45e459f..41372a1e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,10 +40,6 @@ __pycache__/
 /test-libelogind*
 
 # Local Helper Scripts and Tools - Not for distribution
-pwx/patches/*
-!pwx/patches/.keep_dir
-pwx/patches_port/*
-!pwx/patches_port/.keep_dir
 *.orig
 *.rej
 *.remote
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000000000..a763aa614
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,77 @@
+elogind (239.1+20181112+gd4a3f291e395-1+debian1) unstable; urgency=medium
+
+  * Update to upstream 239.2 prerelease. [Mark Hindley]
+  * Change version number to +20181112+gd4a3f291e395. [Ian Jackson]
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Tue, 13 Nov 2018 14:00:36 +0000
+
+elogind (239.1-1+debian1~rc2) unstable; urgency=medium
+
+  * Update fix for SIGABRT to upstream #92.
+  * Disable Dbus activation by default.
+  * Use shutdown rather than poweroff as the latter is missing on runit systems.
+  * Remove upstream pwx git submodule. Thanks to Ian Jackson.
+  * libelogind-dev conflicts libsystemd-dev.
+
+ -- Mark Hindley <mark@hindley.org.uk>  Fri, 09 Nov 2018 13:01:28 +0000
+
+elogind (239.1-1+debian1~rc1) unstable; urgency=medium
+
+  * Initial upload to Debian (closes: #905388).
+  * New upstream release v239.1.
+  * Rework packaging for meson buildsystem.
+  * Change libpam-elogind Breaks dependencies to Conflicts.
+  * Update to debhelper compat 11.
+  * Update to Standards version 4.2.1 (no changes).
+  * Enable LTO build as it works with binutils from unstable (2.31.1).
+  * Include manpages in -dev package.
+  * Move documentation consistency changes to a  quilt patch.
+  * Add AppStream metainfo.
+  * Add upstream watchfile.
+  * Don't package /lib/udev/rules.d/70-power-switch.rules which is also in udev.
+  * Configure with -Dsplit-usr=true to ensure consistent build.
+  * Fix SIGABRT on daemonization caused by freeing overlapping pointers to
+    program_invocation[_short]_name (Upstream:
+    https://github.com/elogind/elogind/issues/92).
+  * New version of /etc/pam.d/elogind-user based on Debian systemd.
+
+ -- Mark Hindley <mark@hindley.org.uk>  Wed, 07 Nov 2018 16:31:31 +0000
+
+elogind (234.4-2~exp1) experimental; urgency=medium
+
+  * debian/rules
+    - Make libpam-elogind break libpam-ck-connector
+  * enable pristine-tar 
+
+ -- Andreas Messer <andi@bastelmap.de>  Thu, 22 Feb 2018 19:49:52 +0100
+
+elogind (234.4-1+devuan1.4) experimental; urgency=medium
+
+  *  debian/libelogind-dev.install
+    -  Drop manpages to allow installation in parallel
+       with libsystemd-dev
+  * debian/extras/elogind
+    - enable elogind pam by default
+
+ -- Andreas Messer <andi@bastelmap.de>  Wed, 07 Feb 2018 22:23:46 +0100
+
+elogind (234.4-1+devuan1.3) experimental; urgency=medium
+
+  * debian/patches/fix-forking.diff 
+    - Fix startpar not erminating due to open file descriptors after
+      forking
+
+ -- Andreas Messer <andi@bastelmap.de>  Sat, 27 Jan 2018 12:44:32 +0100
+
+elogind (234.4-1+devuan1.2) experimental; urgency=medium
+
+  * debian/rules
+    - disable killing background processes on logout
+
+ -- Andreas Messer <andi@bastelmap.de>  Sat, 20 Jan 2018 16:53:32 +0100
+
+elogind (234.4-1+devuan1) experimental; urgency=medium
+
+  * Initial release.
+
+ -- Andreas Messer <andi@bastelmap.de>  Thu, 04 Jan 2018 19:26:09 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000000000..b4de39476
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+11
diff --git a/debian/control b/debian/control
new file mode 100644
index 000000000..9b7716758
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,85 @@
+Source: elogind
+Section: admin
+Priority: optional
+Maintainer: Andreas Messer <andi@bastelmap.de>
+Uploaders: Mark Hindley <mark@hindley.org.uk>
+Standards-Version: 4.2.1
+Vcs-Git: https://git.devuan.org/LeePen/elogind.git
+Vcs-Browser: https://git.devuan.org/LeePen/elogind
+Homepage: https://github.com/elogind/elogind
+Build-Depends: debhelper (>= 11),
+               dpkg-dev (>= 1.16.0),
+               pkg-config,
+               docbook-xsl,
+               meson,
+               gperf,
+               gtk-doc-tools,
+               python3-lxml,
+               libcap-dev,
+               libudev-dev,
+               libmount-dev (>= 2.20),
+               libseccomp-dev (>= 1.0),
+               libblkid-dev (>= 2.24),
+               libpam0g-dev (>= 1.1.2),
+               libacl1-dev,
+               libselinux1-dev,
+               libglib2.0-dev
+
+Package: elogind
+Section: admin
+Priority: optional
+Architecture: linux-any
+Multi-Arch: foreign
+Pre-Depends: debconf, ${misc:Pre-Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libudev1,
+         libelogind0 (= ${binary:Version}),
+         lsb-base (>= 3.1),
+         dbus (>= 1.9.14)
+Recommends: policykit-1
+Provides: logind
+Conflicts: systemd
+Description: user, seat and session management daemon
+ elogind is a session management daemon extracted from systemd project's
+ "logind"
+
+Package: libelogind0
+Section: libs
+Priority: optional
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: user, seat and session management library
+ This library provides access to elogind session management
+
+Package: libelogind-dev
+Section: libdevel
+Priority: optional
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libelogind0 (= ${binary:Version})
+Conflicts: libsystemd-dev
+Description: user, seat and session management library (development files)
+ This package contains the files needed for developing applications that 
+ use libelogind
+
+Package: libpam-elogind
+Section: admin
+Priority: optional
+Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         elogind (= ${binary:Version}),
+         libpam-runtime
+Conflicts: libpam-ck-connector
+Description: elogind PAM module 
+ Plugable Authentication Module to register a session with elogind
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000000000..74c9617ba
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,81 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: elogind
+Source: https://github.com/elogind/elogind
+
+Files: *
+Copyright: 2010-2016 Lennart Poettering
+           2008-2013 Kay Sievers
+           2013-2017 Zbigniew Jędrzejewski-Szmek
+           2014-2015 Tom Gundersen
+           2014-2015 Ronny Chevalier
+           1994-2014 Free Software Foundation, Inc.
+           2005-2014 Rich Felker, et al.
+           1999,2000 Tom Tromey
+           2000,2005 Red Hat, Inc.
+           2010 Harald Hoyer
+           2010 Ran Benita
+           2012 Josh Triplett <josh@joshtriplett.org>
+           2013 Intel Corporation
+           2013 Daniel Buch
+           2013 Dave Reisner
+           2013 David Herrmann
+           2013 David Strauss
+           2013 Holger Hans Peter Freyther
+           2013 Jan Janssen
+           2013 Shawn Landden
+           2013 Thomas H.P. Andersen
+           2014 Emil Renner Berthing <systemd@esmil.dk>
+           2014 Michael Marineau
+           2014 Michal Schmidt
+           2015 Daniel Mack
+           2016 Julian Orth
+           2016 Alexander Shopov <ash@kambanaria.org>
+           2017 Sven Eden
+License: LGPL-2.1+
+
+Files: src/basic/siphash24.c
+       src/basic/siphash24.h
+Copyright: 2012 Jean-Philippe Aumasson <jeanphilippe.aumasson@gmail.com>
+           2012 Daniel J. Bernstein <djb@cr.yp.to>
+License: CC0-1.0
+ To the extent possible under law, the author(s) have dedicated all copyright
+ and related and neighboring rights to this software to the public domain
+ worldwide. This software is distributed without any warranty.
+ .
+ You should have received a copy of the CC0 Public Domain Dedication along with
+ this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+          
+Files: man/glib-event-glue.c:
+Copyright: 2014 Tom Gundersen
+License: Expat
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+Files: debian/*
+Copyright: 2018 Andreas Messer <andi@bastelmap.de>
+License: LGPL-2.1+
+                                                                  
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ .
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
+
diff --git a/debian/elogind.init b/debian/elogind.init
new file mode 100644
index 000000000..2a1d36a7f
--- /dev/null
+++ b/debian/elogind.init
@@ -0,0 +1,88 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: elogind
+# Required-Start: dbus $remote_fs $syslog
+# Required-Stop: dbus $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6  
+# Short-Description: start elogind at boot tim
+# Description: Enable user and session management by elogind
+### END INIT INFO
+
+set -e
+
+# /etc/init.d/elogind: start and stop the elogind session management daemon
+
+ELOGIND=/lib/elogind/elogind
+
+test -x $ELOGIND || exit 0
+
+umask 022
+
+. /lib/lsb/init-functions
+
+ELOGIND_OPTS="-D"
+ELOGIND_PID=/run/elogind.pid
+
+export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
+
+case "$1" in
+  start)
+    log_daemon_msg "Starting session management daemon" "elogind" || true
+    if start-stop-daemon --start --quiet --oknodo --pidfile $ELOGIND_PID --exec $ELOGIND -- $ELOGIND_OPTS; then
+        log_end_msg 0 || true
+    else
+        log_end_msg 1 || true
+    fi
+    ;;
+  stop)
+    log_daemon_msg "Stopping session management daemon" "elogind" || true
+    if start-stop-daemon --stop --quiet --oknodo --pidfile $ELOGIND_PID; then
+        log_end_msg 0 || true
+    else
+        log_end_msg 1 || true
+    fi
+    ;;
+  reload|force-reload|restart)
+    log_daemon_msg "Restarting session management daemon" "elogind" || true
+    start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile $ELOGIND_PID
+    if start-stop-daemon --start --quiet --oknodo --pidfile $ELOGIND_PID --exec $ELOGIND -- $ELOGIND_OPTS; then
+        log_end_msg 0 || true
+    else
+        log_end_msg 1 || true
+    fi
+    ;;
+  try-restart)
+    log_daemon_msg "Restarting session management daemon" "elogind" || true
+    RET=0
+    start-stop-daemon --stop --quiet --retry 30 --pidfile $ELOGIND_PID || RET="$?"
+    case $RET in
+        0)
+        # old daemon stopped
+        if start-stop-daemon --start --quiet --oknodo --pidfile $ELOGIND_PID --exec $ELOGIND -- $ELOGIND_OPTS; then
+            log_end_msg 0 || true
+        else
+            log_end_msg 1 || true
+        fi
+        ;;
+        1)
+        # daemon not running
+        log_progress_msg "(not running)" || true
+        log_end_msg 0 || true
+        ;;
+        *)
+        # failed to stop
+        log_progress_msg "(failed to stop)" || true
+        log_end_msg 1 || true
+        ;;
+    esac
+    ;;
+  status)
+    status_of_proc -p $ELOGIND_PID $ELOGIND elogind && exit 0 || exit $?
+    ;;
+  *)
+    log_action_msg "Usage: /etc/init.d/elogind {start|stop|reload|force-reload|restart|try-restart|status}" || true
+    exit 1
+esac
+
+exit 0
diff --git a/debian/elogind.install b/debian/elogind.install
new file mode 100644
index 000000000..001fe659b
--- /dev/null
+++ b/debian/elogind.install
@@ -0,0 +1,21 @@
+bin/
+usr/bin
+etc/elogind/logind.conf
+lib/elogind/
+lib/udev/rules.d/70-uaccess.rules
+lib/udev/rules.d/71-seat.rules
+lib/udev/rules.d/73-seat-late.rules
+usr/share/bash-completion/
+usr/share/dbus-1/
+usr/share/locale/
+# Skip license files in /usr/share/doc/elogind
+usr/share/doc/elogind/README
+usr/share/doc/elogind/NEWS
+usr/share/man/man1/loginctl.1
+usr/share/man/man1/elogind-inhibit.1
+usr/share/man/man5/
+usr/share/man/man7/elogind.*.7
+usr/share/man/man8/elogind.8
+usr/share/polkit-1/
+usr/share/zsh/
+debian/extra/metainfo/elogind.metainfo.xml usr/share/metainfo
diff --git a/debian/extra/metainfo/elogind.metainfo.xml b/debian/extra/metainfo/elogind.metainfo.xml
new file mode 100644
index 000000000..e6da76c92
--- /dev/null
+++ b/debian/extra/metainfo/elogind.metainfo.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component>
+  <id>devuan.elogind</id>
+  <metadata_license>LGPL-2.1+; CC0-1.0; Expat</metadata_license>
+  <name>elogind</name>
+  <summary>User, seat and session management daemon</summary>
+  <description>
+    <p>
+     elogind is a session management daemon extracted from systemd project's "logind"
+    </p>
+  </description>
+    <provides>
+    <modalias>usb:v058Fp6254d*</modalias>
+    <modalias>usb:v17E9p401Ad*</modalias>
+  </provides>
+</component>
diff --git a/debian/extra/pam-configs/elogind b/debian/extra/pam-configs/elogind
new file mode 100644
index 000000000..e66eebb6d
--- /dev/null
+++ b/debian/extra/pam-configs/elogind
@@ -0,0 +1,7 @@
+Name: elogind Session Management
+Default: yes
+Priority: 0
+Session-Interactive-Only: yes
+Session-Type: Additional
+Session-Final:
+	optional			pam_elogind.so
diff --git a/debian/extra/pam.d/elogind-user b/debian/extra/pam.d/elogind-user
new file mode 100644
index 000000000..6e986e712
--- /dev/null
+++ b/debian/extra/pam.d/elogind-user
@@ -0,0 +1,15 @@
+# This file is part of elogind.
+#
+# Interface to logind instances
+
+@include common-account
+
+# SELinux is disabled at the moment
+# session  required pam_selinux.so close
+# session  required pam_selinux.so nottys open
+session  required pam_loginuid.so
+session  required pam_limits.so
+
+@include common-session-noninteractive
+
+session optional pam_elogind.so
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000000000..ae17e895b
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+debian-branch=suites/experimental
+upstream-tag=v%(version)s
+pristine-tar=True
diff --git a/debian/libelogind-dev.install b/debian/libelogind-dev.install
new file mode 100644
index 000000000..e090c36c0
--- /dev/null
+++ b/debian/libelogind-dev.install
@@ -0,0 +1,4 @@
+usr/include/elogind/
+usr/lib/*/libelogind.so
+usr/lib/*/pkgconfig/
+usr/share/man/man3/*
diff --git a/debian/libelogind0.install b/debian/libelogind0.install
new file mode 100644
index 000000000..01d84bdd4
--- /dev/null
+++ b/debian/libelogind0.install
@@ -0,0 +1 @@
+usr/lib/*/libelogind.so.*
diff --git a/debian/libpam-elogind.install b/debian/libpam-elogind.install
new file mode 100644
index 000000000..3458d5634
--- /dev/null
+++ b/debian/libpam-elogind.install
@@ -0,0 +1,4 @@
+debian/extra/pam.d/ /etc
+lib/*/security/pam_elogind.so
+usr/share/man/man8/pam_elogind.8
+debian/extra/pam-configs/ /usr/share/
diff --git a/debian/libpam-elogind.postinst b/debian/libpam-elogind.postinst
new file mode 100755
index 000000000..7e37590c5
--- /dev/null
+++ b/debian/libpam-elogind.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+pam-auth-update --package
+
+#DEBHELPER#
diff --git a/debian/libpam-elogind.prerm b/debian/libpam-elogind.prerm
new file mode 100755
index 000000000..e6187ae2a
--- /dev/null
+++ b/debian/libpam-elogind.prerm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = remove ]; then
+	pam-auth-update --package --remove elogind
+fi
+
+#DEBHELPER#
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 000000000..7a800323c
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,9 @@
+usr/share/doc/elogind/LICENSE.GPL2
+usr/share/doc/elogind/LICENSE.LGPL2.1
+usr/share/doc/elogind/CODING_STYLE
+usr/share/doc/elogind/GVARIANT-SERIALIZATION
+usr/share/factory/
+# Included in udev
+lib/udev/rules.d/70-power-switch.rules
+# Replaced with file from extras/pam.d
+etc/pam.d/elogind-user
diff --git a/debian/patches/Disable_Dbus_activation_by_default.diff.patch b/debian/patches/Disable_Dbus_activation_by_default.diff.patch
new file mode 100644
index 000000000..48d67330e
--- /dev/null
+++ b/debian/patches/Disable_Dbus_activation_by_default.diff.patch
@@ -0,0 +1,11 @@
+--- a/src/login/org.freedesktop.login1.service.in
++++ b/src/login/org.freedesktop.login1.service.in
+@@ -7,5 +7,7 @@
+ 
+ [D-BUS Service]
+ Name=org.freedesktop.login1
+-Exec=@rootlibexecdir@/elogind --daemon
++# By default, Dbus activation of elogind is disabled. The daemon is started via an init script.
++# Exec=@rootlibexecdir@/elogind --daemon
++Exec=/bin/true
+ User=root
diff --git a/debian/patches/manpage-branding.diff b/debian/patches/manpage-branding.diff
new file mode 100644
index 000000000..f640cd57b
--- /dev/null
+++ b/debian/patches/manpage-branding.diff
@@ -0,0 +1,1050 @@
+Description: Fix documentation to refer to elogind
+Author: Mark Hindley <mark@hindley.org.uk>
+
+---
+
+--- elogind-239.1.orig/man/logind.conf.xml
++++ elogind-239.1/man/logind.conf.xml
+@@ -14,7 +14,7 @@
+     xmlns:xi="http://www.w3.org/2001/XInclude">
+   <refentryinfo>
+     <title>logind.conf</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+ --><!-- else -->
+ <refentry id="logind.conf" xmlns:xi="http://www.w3.org/2001/XInclude">
+   <refentryinfo>
+--- elogind-239.1.orig/man/pam_elogind.xml
++++ elogind-239.1/man/pam_elogind.xml
+@@ -306,8 +306,12 @@ session    required     pam_elogind.so</
+   <refsect1>
+     <title>See Also</title>
+     <para>
++      <!-- 0 /// elogind is in section 8 and has no services
+       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
++      --><!-- else -->
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
++      <!-- // 0 -->
+       <citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+       <citerefentry project='man-pages'><refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd-bus.xml
++++ elogind-239.1/man/sd-bus.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd-bus</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -25,7 +25,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+     </funcsynopsis>
+ 
+     <cmdsynopsis>
+@@ -79,7 +79,7 @@
+   <refsect1>
+     <title>See Also</title>
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-event</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>busctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+       <citerefentry project='man-pages'><refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd-login.xml
++++ elogind-239.1/man/sd-login.xml
+@@ -11,7 +11,7 @@
+ 
+   <refentryinfo>
+     <title>sd-login</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -27,7 +27,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-login.h&gt;</funcsynopsisinfo>
+     </funcsynopsis>
+ 
+     <cmdsynopsis>
+@@ -231,7 +231,7 @@
+   <refsect1>
+     <title>See Also</title>
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_pid_get_session</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_uid_get_state</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_session_is_active</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_booted.xml
++++ elogind-239.1/man/sd_booted.xml
+@@ -11,7 +11,7 @@
+ 
+   <refentryinfo>
+     <title>sd_booted</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -26,7 +26,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-daemon.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-daemon.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_booted</function></funcdef>
+@@ -63,7 +63,7 @@
+   <refsect1>
+     <title>See Also</title>
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+     </para>
+   </refsect1>
+--- elogind-239.1.orig/man/sd_bus_add_match.xml
++++ elogind-239.1/man/sd_bus_add_match.xml
+@@ -12,7 +12,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_add_match</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -31,7 +31,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>typedef int (*<function>sd_bus_message_handler_t</function>)</funcdef>
+@@ -163,7 +163,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_slot_unref</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_message_ref</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_bus_creds_get_pid.xml
++++ elogind-239.1/man/sd_bus_creds_get_pid.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_creds_get_pid</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -59,7 +59,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_bus_creds_get_pid</function></funcdef>
+@@ -522,7 +522,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_creds_new_from_pid</refentrytitle><manvolnum>2</manvolnum></citerefentry>,
+       <citerefentry project='man-pages'><refentrytitle>fork</refentrytitle><manvolnum>2</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_bus_creds_new_from_pid.xml
++++ elogind-239.1/man/sd_bus_creds_new_from_pid.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_creds_new_from_pid</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -31,7 +31,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_bus_creds_new_from_pid</function></funcdef>
+@@ -308,7 +308,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_creds_get_pid</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_get_name_creds</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_bus_default.xml
++++ elogind-239.1/man/sd_bus_default.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_default</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -34,7 +34,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_bus_default</function></funcdef>
+@@ -274,7 +274,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_ref</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_bus_error.xml
++++ elogind-239.1/man/sd_bus_error.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_error</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -39,7 +39,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcsynopsisinfo>typedef struct {
+         const char *name;
+@@ -345,7 +345,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus-errors</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_error_add_map</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_bus_error_add_map.xml
++++ elogind-239.1/man/sd_bus_error_add_map.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_error_add_map</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -29,7 +29,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcsynopsisinfo>typedef struct {
+         const char *name;
+@@ -137,7 +137,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_error</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus-errors</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_bus_get_fd.xml
++++ elogind-239.1/man/sd_bus_get_fd.xml
+@@ -12,7 +12,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_get_fd</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -28,7 +28,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_bus_get_fd</function></funcdef>
+@@ -71,7 +71,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_set_fd</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+     </para>
+--- elogind-239.1.orig/man/sd_bus_message_append.xml
++++ elogind-239.1/man/sd_bus_message_append.xml
+@@ -11,7 +11,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_message_append</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -29,7 +29,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int sd_bus_message_append</funcdef>
+@@ -244,7 +244,7 @@ sd_bus_message_append(m, "ynqiuxtd", y,
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_message_append_basic</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_message_append_array</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+--- elogind-239.1.orig/man/sd_bus_message_append_array.xml
++++ elogind-239.1/man/sd_bus_message_append_array.xml
+@@ -11,7 +11,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_message_append_array</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -31,7 +31,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int sd_bus_message_append_array</funcdef>
+@@ -169,7 +169,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_message_append</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_message_append_basic</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_bus_message_append_basic.xml
++++ elogind-239.1/man/sd_bus_message_append_basic.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_message_append_basic</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -26,7 +26,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int sd_bus_message_append_basic</funcdef>
+@@ -253,7 +253,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_message_append</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <ulink url="http://dbus.freedesktop.org/doc/dbus-specification.html">The D-Bus specification</ulink>
+--- elogind-239.1.orig/man/sd_bus_message_append_strv.xml
++++ elogind-239.1/man/sd_bus_message_append_strv.xml
+@@ -11,7 +11,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_message_append_strv</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -27,7 +27,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int sd_bus_message_append_strv</funcdef>
+@@ -73,7 +73,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_message_append</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_message_append_array</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_bus_message_read_basic.xml
++++ elogind-239.1/man/sd_bus_message_read_basic.xml
+@@ -12,7 +12,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_message_read_basic</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -28,7 +28,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_bus_message_read_basic</function></funcdef>
+@@ -84,7 +84,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+     </para>
+   </refsect1>
+--- elogind-239.1.orig/man/sd_bus_negotiate_fds.xml
++++ elogind-239.1/man/sd_bus_negotiate_fds.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_negotiate_fds</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -28,7 +28,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_bus_negotiate_fds</function></funcdef>
+@@ -133,7 +133,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_start</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_message_can_send</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_bus_new.xml
++++ elogind-239.1/man/sd_bus_new.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_new</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -29,7 +29,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_bus_new</function></funcdef>
+@@ -145,7 +145,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_default_user</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_default_system</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_bus_process.xml
++++ elogind-239.1/man/sd_bus_process.xml
+@@ -12,7 +12,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_process</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -28,7 +28,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_bus_process</function></funcdef>
+@@ -82,7 +82,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+     </para>
+   </refsect1>
+--- elogind-239.1.orig/man/sd_bus_request_name.xml
++++ elogind-239.1/man/sd_bus_request_name.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_request_name</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -28,7 +28,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_bus_request_name</function></funcdef>
+@@ -205,7 +205,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_slot_unref</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+--- elogind-239.1.orig/man/sd_bus_track_add_name.xml
++++ elogind-239.1/man/sd_bus_track_add_name.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_track_add_name</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -35,7 +35,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_bus_track_add_name</function></funcdef>
+@@ -222,7 +222,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_bus_track_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+     </para>
+--- elogind-239.1.orig/man/sd_bus_track_new.xml
++++ elogind-239.1/man/sd_bus_track_new.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_bus_track_new</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -34,7 +34,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-bus.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-bus.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_bus_track_new</function></funcdef>
+@@ -224,7 +224,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+       <citerefentry><refentrytitle>sd_bus_track_add_name</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+     </para>
+--- elogind-239.1.orig/man/sd_event_add_child.xml
++++ elogind-239.1/man/sd_event_add_child.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_event_add_child</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -28,7 +28,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-event.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-event.h&gt;</funcsynopsisinfo>
+ 
+       <funcsynopsisinfo><token>typedef</token> struct sd_event_source sd_event_source;</funcsynopsisinfo>
+ 
+@@ -203,7 +203,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-event</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_now</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_event_add_defer.xml
++++ elogind-239.1/man/sd_event_add_defer.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_event_add_defer</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -29,7 +29,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-event.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-event.h&gt;</funcsynopsisinfo>
+ 
+       <funcsynopsisinfo><token>typedef</token> struct sd_event_source sd_event_source;</funcsynopsisinfo>
+ 
+@@ -173,7 +173,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-event</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_now</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_event_add_signal.xml
++++ elogind-239.1/man/sd_event_add_signal.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_event_add_signal</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -29,7 +29,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-event.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-event.h&gt;</funcsynopsisinfo>
+ 
+       <funcsynopsisinfo><token>typedef</token> struct sd_event_source sd_event_source;</funcsynopsisinfo>
+ 
+@@ -178,7 +178,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-event</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_now</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_event_add_time.xml
++++ elogind-239.1/man/sd_event_add_time.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_event_add_time</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -32,7 +32,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-event.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-event.h&gt;</funcsynopsisinfo>
+ 
+       <funcsynopsisinfo><token>typedef</token> struct sd_event_source sd_event_source;</funcsynopsisinfo>
+ 
+@@ -268,7 +268,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-event</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_now</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_event_new.xml
++++ elogind-239.1/man/sd_event_new.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_event_new</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -32,7 +32,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-event.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-event.h&gt;</funcsynopsisinfo>
+ 
+       <funcsynopsisinfo><token>typedef</token> struct sd_event sd_event;</funcsynopsisinfo>
+ 
+@@ -205,7 +205,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-event</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_add_io</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_add_time</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_event_run.xml
++++ elogind-239.1/man/sd_event_run.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_event_run</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -27,7 +27,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-event.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-event.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_event_run</function></funcdef>
+@@ -148,7 +148,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_add_io</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_add_time</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_event_source_unref.xml
++++ elogind-239.1/man/sd_event_source_unref.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_event_source_unref</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -28,7 +28,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-event.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-event.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>sd_event_source* <function>sd_event_source_unref</function></funcdef>
+--- elogind-239.1.orig/man/sd_event_wait.xml
++++ elogind-239.1/man/sd_event_wait.xml
+@@ -10,7 +10,7 @@
+ 
+   <refentryinfo>
+     <title>sd_event_wait</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -37,7 +37,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-event.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-event.h&gt;</funcsynopsisinfo>
+ 
+       <funcsynopsisinfo><token>enum</token> {
+         <constant>SD_EVENT_INITIAL</constant>,
+@@ -315,7 +315,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_add_io</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_event_add_time</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_id128_get_machine.xml
++++ elogind-239.1/man/sd_id128_get_machine.xml
+@@ -120,7 +120,7 @@
+ 
+       <para>Here's a simple example for an application specific machine ID:</para>
+ 
+-      <programlisting>#include &lt;systemd/sd-id128.h&gt;
++      <programlisting>#include &lt;elogind/sd-id128.h&gt;
+ #include &lt;stdio.h&gt;
+ 
+ #define OUR_APPLICATION_ID SD_ID128_MAKE(c2,73,27,73,23,db,45,4e,a6,3b,b9,6e,79,b5,3e,97)
+@@ -138,7 +138,7 @@ int main(int argc, char *argv[]) {
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-id128</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_is_fifo.xml
++++ elogind-239.1/man/sd_is_fifo.xml
+@@ -11,7 +11,7 @@
+ 
+   <refentryinfo>
+     <title>sd_is_fifo</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -32,7 +32,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-daemon.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-daemon.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_is_fifo</function></funcdef>
+@@ -187,7 +187,7 @@
+   <refsect1>
+     <title>See Also</title>
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_listen_fds</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_listen_fds.xml
++++ elogind-239.1/man/sd_listen_fds.xml
+@@ -11,7 +11,7 @@
+ 
+   <refentryinfo>
+     <title>sd_listen_fds</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -28,7 +28,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-daemon.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-daemon.h&gt;</funcsynopsisinfo>
+ 
+       <funcsynopsisinfo>#define SD_LISTEN_FDS_START 3</funcsynopsisinfo>
+ 
+@@ -217,7 +217,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_is_fifo</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_is_socket</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_login_monitor_new.xml
++++ elogind-239.1/man/sd_login_monitor_new.xml
+@@ -11,7 +11,7 @@
+ 
+   <refentryinfo>
+     <title>sd_login_monitor_new</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -33,7 +33,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-login.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_login_monitor_new</function></funcdef>
+@@ -240,7 +240,7 @@ else {
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_get_seats</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>poll</refentrytitle><manvolnum>2</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_notify.xml
++++ elogind-239.1/man/sd_notify.xml
+@@ -388,7 +388,7 @@
+   <refsect1>
+     <title>See Also</title>
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_listen_fds</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_listen_fds_with_names</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_pid_get_owner_uid.xml
++++ elogind-239.1/man/sd_pid_get_owner_uid.xml
+@@ -11,7 +11,7 @@
+ 
+   <refentryinfo>
+     <title>sd_pid_get_owner_uid</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -43,7 +43,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-login.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_pid_get_owner_uid</function></funcdef>
+@@ -309,7 +309,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_session_is_active</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>getsid</refentrytitle><manvolnum>2</manvolnum></citerefentry>,
+--- elogind-239.1.orig/man/sd_uid_get_state.xml
++++ elogind-239.1/man/sd_uid_get_state.xml
+@@ -11,7 +11,7 @@
+ 
+   <refentryinfo>
+     <title>sd_uid_get_state</title>
+-    <productname>systemd</productname>
++    <productname>elogind</productname>
+   </refentryinfo>
+ 
+   <refmeta>
+@@ -30,7 +30,7 @@
+ 
+   <refsynopsisdiv>
+     <funcsynopsis>
+-      <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
++      <funcsynopsisinfo>#include &lt;elogind/sd-login.h&gt;</funcsynopsisinfo>
+ 
+       <funcprototype>
+         <funcdef>int <function>sd_uid_get_state</function></funcdef>
+@@ -191,7 +191,7 @@
+     <title>See Also</title>
+ 
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd_pid_get_owner_uid</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+     </para>
+--- elogind-239.1.orig/man/sd_watchdog_enabled.xml
++++ elogind-239.1/man/sd_watchdog_enabled.xml
+@@ -133,7 +133,7 @@
+   <refsect1>
+     <title>See Also</title>
+     <para>
+-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
++      <citerefentry><refentrytitle>elogind</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>daemon</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+       <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..f98eee609
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+Disable_Dbus_activation_by_default.diff.patch
+manpage-branding.diff
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000000000..a45cf0fc5
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,50 @@
+#! /usr/bin/make -f
+
+# The options have been chooses as follows:
+# - manually set pamlibdir because we'Re installing in /usr by default but
+#   pam libs must go to /lib/*/security, same for udev rules
+# - disable killing users processes by default. This is weird an unexpected
+#   behavior
+# - /sbin/poweroff is missing on runit systems, so use /sbin/shutdown instead
+# - SELinux build is broken on 239 (fix available for 240)
+# - tests disabled beacuase some of the tests seem to require elogind running.
+#   Need to sort out which tests could be run
+
+CONFFLAGS = \
+  -Dpamlibdir=/lib/$(DEB_HOST_MULTIARCH)/security \
+  -Drootlibdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+  -Dsplit-usr=true \
+  -Ddocdir=/usr/share/doc/elogind \
+  -Dudevrulesdir=/lib/udev/rules.d \
+  -Ddefault-kill-user-processes=false \
+  -Dpoweroff-path=/sbin/shutdown \
+  -Dselinux=false \
+  -Dtests=false
+
+CONFFLAGS_CGROUPCTRL_ELOGIND= \
+  -Dcgroup-controller=elogind
+
+override_dh_auto_configure:
+	dh_auto_configure --builddirectory=build \
+        -- $(CONFFLAGS) $(CONFFLAGS_CGROUPCTRL_ELOGIND)
+
+override_dh_auto_install:
+	dh_auto_install --builddirectory=build
+
+override_dh_auto_clean:
+	dh_auto_clean --builddirectory=build
+	# remove Python byte code files
+	rm -rf tools/__pycache__/
+
+override_dh_missing:
+	dh_missing --list-missing
+
+override_dh_makeshlibs:
+	dh_makeshlibs -pelogind -Xlibelogind-shared
+	dh_makeshlibs --remaining
+
+override_dh_shlibdeps:
+	dh_shlibdeps -- -xlibeudev1
+
+%:
+	dh $@  --builddirectory=build --without autoreconf,systemd --buildsystem=meson
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000000000..158e3faed
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,11 @@
+# watch control file for uscan
+# See uscan(1) for format
+
+version=3
+
+# For GitHub projects you can use the tags or releases page.  Since the archive
+# URLs use only the version as the name, it is recommended to use a
+# filenamemangle to adjust the name of the downloaded file:
+opts="filenamemangle=s/(?:.*)?v?(\d[\d\.]*)\.tar\.gz/elogind-$1.tar.gz/" \
+ "dversionmangle=s/\+nosubmodule//" \
+ https://github.com/elogind/elogind/tags (?:.*/)?v?(\d[\d\.]*)\.tar\.gz