From: Benno Schulenberg <bensberg@telfort.nl>
Date: Mon, 2 Jun 2025 14:14:33 +0000 (+0200)
Subject: correct the full name of the GPL in various files
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c4b2b66bad23e605dd6392921d0750770145e4a1;p=thirdparty%2Futil-linux.git

correct the full name of the GPL in various files

Last year, commit f4cb44bd11 corrected the full name of the GPL in
a dozen files, but still left the mistaken name in eight places.

(Also, in the first file, just reshuffle the license line, to be
in the same position as in other files.)

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
---

diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c
index 2c56e1501..29484ffe5 100644
--- a/disk-utils/swaplabel.c
+++ b/disk-utils/swaplabel.c
@@ -1,16 +1,15 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
+ * This file may be redistributed under the terms of the
+ * GNU General Public License version 2 or later.
+ *
  * swaplabel.c - Print or change the label / UUID of a swap partition
  *
  * Copyright (C) 2010 Jason Borden <jborden@bluehost.com>
  * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
  *
  * Usage: swaplabel [-L label] [-U UUID] device
- *
- * This file may be redistributed under the terms of the GNU General Public License
- * version 2 or later.
- *
  */
 #include <stdio.h>
 #include <stddef.h>
diff --git a/include/ismounted.h b/include/ismounted.h
index 62b1d26b5..c95cbde84 100644
--- a/include/ismounted.h
+++ b/include/ismounted.h
@@ -1,8 +1,8 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the
+ * GNU General Public License.
  */
 #ifndef IS_MOUNTED_H
 #define IS_MOUNTED_H
diff --git a/include/pager.h b/include/pager.h
index e5ba4d721..2172177ee 100644
--- a/include/pager.h
+++ b/include/pager.h
@@ -1,7 +1,8 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * This file may be redistributed under the terms of the GNU General Public License.
+ * This file may be redistributed under the terms of the
+ * GNU General Public License.
  */
 #ifndef UTIL_LINUX_PAGER
 #define UTIL_LINUX_PAGER
diff --git a/lib/ismounted.c b/lib/ismounted.c
index 31be71a43..ae5327c90 100644
--- a/lib/ismounted.c
+++ b/lib/ismounted.c
@@ -3,8 +3,8 @@
  *
  * Copyright (C) 1995,1996,1997,1998,1999,2000,2008 Theodore Ts'o.
  *
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the
+ * GNU General Public License.
  */
 #include <stdio.h>
 #include <unistd.h>
diff --git a/lib/pager.c b/lib/pager.c
index 20002acda..c3b42d19e 100644
--- a/lib/pager.c
+++ b/lib/pager.c
@@ -1,8 +1,8 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the
+ * GNU General Public License.
  *
  * Based on linux-perf/git scm
  *
diff --git a/misc-utils/findfs.c b/misc-utils/findfs.c
index 7b32dbda3..801a60c32 100644
--- a/misc-utils/findfs.c
+++ b/misc-utils/findfs.c
@@ -1,8 +1,8 @@
 /*
  * Copyright (C) 2009 Karel Zak <kzak@redhat.com>
  *
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the
+ * GNU General Public License.
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 74e950307..95cf1a572 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -4,8 +4,8 @@
  * Copyright (C) 2007  Theodore Ts'o
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the
+ * GNU General Public License.
  * %End-Header%
  */
 
diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
index 56dea3c71..6133cb0eb 100644
--- a/misc-utils/uuidgen.c
+++ b/misc-utils/uuidgen.c
@@ -4,8 +4,8 @@
  * Copyright (C) 1999, Andreas Dilger and Theodore Ts'o
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the
+ * GNU General Public License.
  * %End-Header%
  */
 
diff --git a/sys-utils/eject.1.adoc b/sys-utils/eject.1.adoc
index 1ee3b2137..6db040729 100644
--- a/sys-utils/eject.1.adoc
+++ b/sys-utils/eject.1.adoc
@@ -4,7 +4,7 @@ Copyright (C) 1994-2005 Jeff Tranter (tranter@pobox.com)
 Copyright (C) 2012 Karel Zak <kzak@redhat.com>.
 
 It may be distributed under the GNU General Public License, version 2, or
-any higher version. See section COPYING of the GNU Public license
+any higher version. See section COPYING of the GNU General Public license
 for conditions under which this file may be redistributed.
 ////
 = eject(1)