"Correct" license from LGPL2 to LGPL2.1

Back in commit 7469f26a33c072169d6ed929352eda06562ffe3f when the COPYING
file was added to the repository and the project was "licensed," the
license file was

                     GNU LESSER GENERAL PUBLIC LICENSE
                          Version 2.1, February 1999

However, the license was abbreviated as LGPL2 in various places (pretty
much everywhere, actually), due to my own ignorance/carelessness.  (I was
distinguishing it from shiny new version 3, released 6 months earlier.)

Version 2 of LGPL is the "Library General Public License," published in
June 1991: https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html

Note that this ambiguity persists for most of the project's lifetime.  For
example, the original debian/copyright in 8adc9dac1d61f34ce85e3cbad1478e3e6ffe2b8e
said "LGPL2" bug in 4545f8b929cc562a1231c0ceb067e9d8e58a0de7 (2009, a year
later) it is changed to LGPL2.1 to satisfy Debian's lintian checks.  (It's
remained LGPL2.1 ever since.)

"Correct" the record by changing LGPL2 references to LGPL2.1.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/CodingStyle b/CodingStyle
index 870c0ce5d39dfb2295d34a607d7b155c5a094e3c..05c63b6a4a4b68efb74357318edcdc9b79186480 100644 (file)
--- a/CodingStyle
+++ b/CodingStyle
@@ -70,7 +70,7 @@ by section.
 * Comments > File Comments:
 
    Don't sweat it, unless the license varies from that of the project
-   (LGPL2) or the code origin isn't reflected by the git history.
+   (LGPL2.1) or the code origin isn't reflected by the git history.
 
 * Formatting > Tabs:
   Indent width is two spaces.  When runs of 8 spaces can be compressed

diff --git a/debian/copyright b/debian/copyright
index 994d676073ae8fa6f21ac1ef386a4ff5ff48c518..13ffa964c8671eebc736690918b7f04ecf8919eb 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -102,7 +102,7 @@ License:
 
 Files: src/test/common/Throttle.cc src/test/filestore/chain_xattr.cc
 Copyright: Copyright (C) 2013 Cloudwatt <libre.licensing@cloudwatt.com>
-License: LGPL2 or later
+License: LGPL2.1 or later
 
 Files: src/osd/ErasureCodePluginJerasure/*.{c,h}
 Copyright: Copyright (c) 2011, James S. Plank <plank@cs.utk.edu>

diff --git a/src/crush/crush.h b/src/crush/crush.h
index e5bdba2d791e0638817d5d1da52a187f400caaf2..ff78656e2af26973e50e38e9d82f2c24bc061716 100644 (file)
--- a/src/crush/crush.h
+++ b/src/crush/crush.h
@@ -17,7 +17,7 @@
  *
  *     http://www.ssrc.ucsc.edu/Papers/weil-sc06.pdf
  *
- * LGPL2
+ * LGPL2.1
  */
 
 

diff --git a/src/crush/mapper.h b/src/crush/mapper.h
index b397070bef291bbca25e633ac1177282a61b2f4a..e76be7672124c7b065ff603f98c33f4adad6a964 100644 (file)
--- a/src/crush/mapper.h
+++ b/src/crush/mapper.h
@@ -5,7 +5,7 @@
  * CRUSH functions for find rules and then mapping an input to an
  * output set.
  *
- * LGPL2
+ * LGPL2.1
  */
 
 #include "crush.h"

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 9542a887ea3b9e8130be05a56e98194f2c5259b4..6f755fbdee812824ac60a745d4fac53ed61edf43 100644 (file)
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -6,7 +6,7 @@
  * primarily intended to describe data structures that pass over the
  * wire or that are stored on disk.
  *
- * LGPL2
+ * LGPL2.1
  */
 
 #ifndef CEPH_FS_H

diff --git a/src/pybind/ceph_argparse.py b/src/pybind/ceph_argparse.py
index 5d587b4ed4b4a032d7873c40ca760aa95d102817..ef5b002eabb1d57e253427e7f9b28cdd1e75c630 100644 (file)
--- a/src/pybind/ceph_argparse.py
+++ b/src/pybind/ceph_argparse.py
@@ -7,7 +7,7 @@ daemon.
 
 Copyright (C) 2013 Inktank Storage, Inc.
 
-LGPL2.  See file COPYING.
+LGPL2.1.  See file COPYING.
 """
 from __future__ import print_function
 import copy

diff --git a/src/pybind/ceph_volume_client.py b/src/pybind/ceph_volume_client.py
index fb71bcd58171bea2ff47338608fa149177ebfb59..8e21e13fffa6d1439cb9c329187b21cbe519983a 100644 (file)
--- a/src/pybind/ceph_volume_client.py
+++ b/src/pybind/ceph_volume_client.py
@@ -1,7 +1,7 @@
 """
 Copyright (C) 2015 Red Hat, Inc.
 
-LGPL2.  See file COPYING.
+LGPL2.1.  See file COPYING.
 """
 
 from contextlib import contextmanager