From 8265352a8ecf509b81f318267823ee419a68c69d Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Thu, 3 Feb 2022 22:40:43 +0100
Subject: [PATCH] specify in the COPYING file that we are LGPL-v2.1-only

Closes: https://framagit.org/simgrid/simgrid/-/issues/101
---
 COPYING               | 12 ++++++------
 ChangeLog             |  1 +
 docs/source/index.rst |  2 +-
 setup.py              |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/COPYING b/COPYING
index 216f5c496b..9055249dbd 100644
--- a/COPYING
+++ b/COPYING
@@ -4,7 +4,7 @@ Source: https://simgrid.org/
 
 Files: *
 Copyright: 2003-2022. The SimGrid team. All rights reserved.
-License: LGPL-2.1
+License: LGPL-2.1-only
 
 Files: src/xbt/snprintf.c
 Copyright: 1999, Mark Martinec <mark.martinec@ijs.si.
@@ -15,7 +15,7 @@ Files: src/xbt/mmalloc/* src/include/xbt/mmalloc.h
 Copyright:
   Copyright (C) 1991, 1992 Free Software Foundation, Inc.
   Copyright (C) 2003-2022. The SimGrid team.
-License: LGPL-2.1
+License: LGPL-2.1-only
 Comment: these files used to be part of gdb, but were removed there
 
 Files:
@@ -73,8 +73,8 @@ Copyright:
  FleXML is Copyright (C) 1999-2005 Kristoffer Rose.  All rights reserved.
  FleXML is Copyright (C) 2003-2013 Martin Quinson.  All rights reserved.
  Copyright (C) 2003-2022. The SimGrid team.
-License: GPL-2+ and LGPL-2.1
-Comment: Generated with the FleXML XML processor generator (which is GPL-2+) using SimGrid configuration files (that are LGPL-2.1)
+License: GPL-2+ and LGPL-2.1-only
+Comment: Generated with the FleXML XML processor generator (which is GPL-2+) using SimGrid configuration files (that are LGPL-2.1-only)
 
 Files:
  src/smpi/colls/allgather/allgather-2dmesh.cpp
@@ -177,8 +177,8 @@ Files: src/xbt/automaton/parserPromela.tab.cacc
 Copyright:
  Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
  Copyright (C) 2003-2022. The SimGrid team.
-License: GPL-3+ and LGPL-2.1
-Comment: Generated with the Bison processor generator (which is GPL-3+) using SimGrid configuration files (that are LGPL-2.1)
+License: GPL-3+ and LGPL-2.1-only
+Comment: Generated with the Bison processor generator (which is GPL-3+) using SimGrid configuration files (that are LGPL-2.1-only)
 
 Files: src/include/catch.hpp
 Copyright:
diff --git a/ChangeLog b/ChangeLog
index 80a78928cd..1650724d75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ XBT:
 Fixed bugs (FG#.. -> FramaGit bugs; FG!.. -> FG merge requests)
  (FG: issues on Framagit; GH: issues on GitHub)
  - FG#100: [SMPI] Order of the message matching is not guaranteed
+ - FG#101: LGPL 2.1 is deprecated license
 
 ----------------------------------------------------------------------------
 
diff --git a/docs/source/index.rst b/docs/source/index.rst
index a184df2484..050033fd45 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -31,7 +31,7 @@ interaction with SimGrid is done by writing programs with the exposed
 functions to build your own simulator. This can be done in C/C++, Python or Java,
 on Linux, Mac OSX or Windows (using the WSL).
 
-SimGrid is a Free Software distributed under the LGPL-2.1 license. You are
+SimGrid is a Free Software distributed under the LGPL-2.1-only license. You are
 welcome to use, study, share and improve it, provided that your version is as
 free as ours. SimGrid is developed for 20 years by a lively community of users
 and researchers from several groups, initially in France and the U.S.A. It
diff --git a/setup.py b/setup.py
index 44d4982ec4..6a12eb72e6 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2019-2022. The SimGrid Team. All rights reserved.
 
 # This program is free software; you can redistribute it and/or modify it
-# under the terms of the license (GNU LGPL) which comes with this package.
+# under the terms of the license (GNU LGPL-2.1-only) which comes with this package.
 
 # python3 setup.py sdist # Build a source distrib (building binary distribs is complex on linux)
 
-- 
2.20.1