From 9641fcaf8c057e14fa1c72985e8a670b05e5bbdc Mon Sep 17 00:00:00 2001
From: Sven Eden <yamakuzure@gmx.net>
Date: Thu, 19 Apr 2018 18:37:32 +0200
Subject: Update man page sources to upstream tag v236 variants.

---
 man/sd_event_add_time.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'man/sd_event_add_time.xml')

diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index d5e2e9137..f41ece79c 100644
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -3,6 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2014 Lennart Poettering
-- 
cgit v1.2.3


From 9d1ff89d622fd4d8b3be210996cfa73943d81e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 6 Apr 2018 18:58:55 +0200
Subject: tree-wide: drop license boilerplate

Files which are installed as-is (any .service and other unit files, .conf
files, .policy files, etc), are left as is. My assumption is that SPDX
identifiers are not yet that well known, so it's better to retain the
extended header to avoid any doubt.

I also kept any copyright lines. We can probably remove them, but it'd nice to
obtain explicit acks from all involved authors before doing that.
---
 man/sd_event_add_time.xml | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'man/sd_event_add_time.xml')

diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index f41ece79c..cb1ffd72b 100644
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -8,19 +8,6 @@
   This file is part of systemd.
 
   Copyright 2014 Lennart Poettering
-
-  systemd 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.
-
-  systemd 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 systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <refentry id="sd_event_add_time" xmlns:xi="http://www.w3.org/2001/XInclude">
-- 
cgit v1.2.3


From eed5a7bdfdce83b00734d7d40fa29f271871acf7 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 29 May 2018 15:59:26 +0200
Subject: man: document the new sd_event_add_inotify() call

---
 man/sd_event_add_time.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'man/sd_event_add_time.xml')

diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index cb1ffd72b..ef334b171 100644
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -288,6 +288,7 @@
       <citerefentry><refentrytitle>sd_event_add_io</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd_event_add_signal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd_event_add_child</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>sd_event_add_inotify</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd_event_add_defer</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd_event_source_set_enabled</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>sd_event_source_set_priority</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-- 
cgit v1.2.3


From dd656b3679e4b5a7ec3534bf8786b022327e080d Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 12 Jun 2018 17:04:27 +0200
Subject: tree-wide: drop 'This file is part of systemd' blurb

This part of the copyright blurb stems from the GPL use recommendations:

https://www.gnu.org/licenses/gpl-howto.en.html

The concept appears to originate in times where version control was per
file, instead of per tree, and was a way to glue the files together.
Ultimately, we nowadays don't live in that world anymore, and this
information is entirely useless anyway, as people are very welcome to
copy these files into any projects they like, and they shouldn't have to
change bits that are part of our copyright header for that.

hence, let's just get rid of this old cruft, and shorten our codebase a
bit.
---
 man/sd_event_add_time.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'man/sd_event_add_time.xml')

diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index ef334b171..e367f4e16 100644
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -5,8 +5,6 @@
 <!--
   SPDX-License-Identifier: LGPL-2.1+
 
-  This file is part of systemd.
-
   Copyright 2014 Lennart Poettering
 -->
 
-- 
cgit v1.2.3


From 3af26cec424c7108d1065754f5583827b9f9c3c5 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 12 Jun 2018 18:23:39 +0200
Subject: tree-wide: remove Lennart's copyright lines

These lines are generally out-of-date, incomplete and unnecessary. With
SPDX and git repository much more accurate and fine grained information
about licensing and authorship is available, hence let's drop the
per-file copyright notice. Of course, removing copyright lines of others
is problematic, hence this commit only removes my own lines and leaves
all others untouched. It might be nicer if sooner or later those could
go away too, making git the only and accurate source of authorship
information.
---
 man/sd_event_add_time.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'man/sd_event_add_time.xml')

diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index e367f4e16..0cb628e85 100644
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -4,8 +4,6 @@
 
 <!--
   SPDX-License-Identifier: LGPL-2.1+
-
-  Copyright 2014 Lennart Poettering
 -->
 
 <refentry id="sd_event_add_time" xmlns:xi="http://www.w3.org/2001/XInclude">
-- 
cgit v1.2.3


From c4bf2a567a48fbc342fe840d821af5da38dd2505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 14 Jun 2018 12:02:53 +0200
Subject: man: drop unused <authorgroup> tags from man sources

Docbook styles required those to be present, even though the templates that we
use did not show those names anywhere. But something changed semi-recently (I
would suspect docbook templates, but there was only a minor version bump in
recent years, and the changelog does not suggest anything related), and builds
now work without those entries. Let's drop this dead weight.

Tested with F26-F29, debian unstable.

$ perl -i -0pe 's/\s*<authorgroup>.*<.authorgroup>//gms' man/*xml
---
 man/sd_event_add_time.xml | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'man/sd_event_add_time.xml')

diff --git a/man/sd_event_add_time.xml b/man/sd_event_add_time.xml
index 0cb628e85..57d577b68 100644
--- a/man/sd_event_add_time.xml
+++ b/man/sd_event_add_time.xml
@@ -11,15 +11,6 @@
   <refentryinfo>
     <title>sd_event_add_time</title>
     <productname>systemd</productname>
-
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Lennart</firstname>
-        <surname>Poettering</surname>
-        <email>lennart@poettering.net</email>
-      </author>
-    </authorgroup>
   </refentryinfo>
 
   <refmeta>
-- 
cgit v1.2.3