[gpsd-dev] [PATCH] Align COPYRIGHT files with Project Licence

[Sanjeev Gupta]

Most of the files are tagged SPDX BSD-2-Clause.  Emails on the
gpsd-dev mailing list also confirm that the intention of the lead
developer, ESR, is that the BSD-2-Clause licence be used.

I believe there is consensus on this.

This patch:
1. Makes some minor formatting changes (tabs -> spaces)
2. Removes pseudo HTML formatting
3. Removes the mistaken 3rd clause included (non-endorsement)
4. Adds numbers to the clause, to follow the text on the OSI site
5. Replaces the word "Regents" with "Copyright Holder" in the
   disclaimer, as per the OSI text.

Please add Sign-Offs if I have captured the consensus correctly.

Signed-off-by: Sanjeev Gupta <address@hidden>
---
 COPYING | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/COPYING b/COPYING
index 07653867..a47677ba 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-                       COPYRIGHTS
+                          COPYRIGHTS
 
 Compilation copyright is held by the GPSD project.  All rights reserved.
 
@@ -8,28 +8,25 @@ Eric S. Raymond. Other portions of the GPSD code are 
Copyright (c)
 Copyright (c) 2005 by Eric S. Raymond.  For other copyrights, see
 individual files.
 
-                       BSD LICENSE
+                           LICENSE
+              (SPDX short identifier: BSD-2-Clause)
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
-are met:<P>
+are met:
 
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.<P>
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
 
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.<P>
-
-Neither name of the GPSD project nor the names of its contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-- 
2.19.1