From 33c392da07b8c3b4d077d50d4b52f2c1e16eb55e Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Tue, 8 Mar 2016 10:44:39 +0100 Subject: updating licensing information --- OWNERS.rst | 20 -------------------- api-bank.rst | 4 +++- api-common.rst | 4 +++- api-merchant.rst | 5 ++++- api-mint.rst | 4 +++- conf.py | 7 ++++++- dev-wallet-wx.rst | 4 +++- example-essay-store.rst | 4 +++- exts/tsref.py | 2 ++ glossary.rst | 4 +++- impl-merchant.rst | 5 ++++- impl-mint.rst | 4 +++- index.rst | 6 +++++- licensing.rst | 31 +++++++++++++++++++++++++++++++ 14 files changed, 73 insertions(+), 31 deletions(-) delete mode 100644 OWNERS.rst create mode 100644 licensing.rst diff --git a/OWNERS.rst b/OWNERS.rst deleted file mode 100644 index dcb3abd8..00000000 --- a/OWNERS.rst +++ /dev/null @@ -1,20 +0,0 @@ -The following list associated each source file with its owner - - -* impl-mint.rst GNUnet e.V. and INRIA -* integration-bank.rst GNUnet e.V. and INRIA -* impl-merchant.rst GNUnet e.V. and INRIA -* dev-wallet-wx.rst GNUnet e.V. and INRIA -* integration-merchant.rst GNUnet e.V. and INRIA -* api-mint.rst GNUnet e.V. and INRIA -* integration-general.rst GNUnet e.V. and INRIA -* wireformats.rst GNUnet e.V. and INRIA -* index.rst GNUnet e.V. and INRIA -* api-merchant.rst GNUnet e.V. and INRIA -* api-common.rst GNUnet e.V. and INRIA -* api-bank.rst GNUnet e.V. and INRIA -* glossary.rst GNUnet e.V. and INRIA -* example-essay-store.rst GNUnet e.V. and INRIA - -* exts/tsref.py GNUnet e.V. and INRIA -* conf.py GNUnet e.V. and INRIA diff --git a/api-bank.rst b/api-bank.rst index d7a8a209..3cfbcc3e 100644 --- a/api-bank.rst +++ b/api-bank.rst @@ -1,6 +1,6 @@ .. This file is part of GNU TALER. - Copyright (C) 2014, 2015 GNUnet e.V. and INRIA + Copyright (C) 2014, 2015, 2016 INRIA TALER 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, or (at your option) any later version. @@ -9,6 +9,8 @@ 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 TALER; see the file COPYING. If not, see + + @author Marcello Stanisci ========= Bank API diff --git a/api-common.rst b/api-common.rst index 788a6784..0a74aeef 100644 --- a/api-common.rst +++ b/api-common.rst @@ -1,6 +1,6 @@ .. This file is part of GNU TALER. - Copyright (C) 2014, 2015 GNUnet e.V. and INRIA + Copyright (C) 2014, 2015, 2016 GNUnet e.V. and INRIA TALER 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, or (at your option) any later version. @@ -10,6 +10,8 @@ You should have received a copy of the GNU Lesser General Public License along with TALER; see the file COPYING. If not, see + @author Christian Grothoff + .. _http-common: ================================= diff --git a/api-merchant.rst b/api-merchant.rst index ba83cd01..9dfee37f 100644 --- a/api-merchant.rst +++ b/api-merchant.rst @@ -1,6 +1,6 @@ .. This file is part of GNU TALER. - Copyright (C) 2014, 2015 GNUnet e.V. and INRIA + Copyright (C) 2014, 2015, 2016 and INRIA TALER 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, or (at your option) any later version. @@ -10,6 +10,9 @@ You should have received a copy of the GNU Lesser General Public License along with TALER; see the file COPYING. If not, see + @author Florian Dold + @author Marcello Stanisci + ===================== The Merchant HTTP API ===================== diff --git a/api-mint.rst b/api-mint.rst index bfb48dbd..6c629a09 100644 --- a/api-mint.rst +++ b/api-mint.rst @@ -1,6 +1,6 @@ .. This file is part of GNU TALER. - Copyright (C) 2014, 2015 GNUnet e.V. and INRIA + Copyright (C) 2014, 2015, 2016 GNUnet e.V. and INRIA TALER 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, or (at your option) any later version. @@ -10,6 +10,8 @@ You should have received a copy of the GNU Lesser General Public License along with TALER; see the file COPYING. If not, see + @author Christian Grothoff + ========================= The Exchange RESTful JSON API ========================= diff --git a/conf.py b/conf.py index 18cb5139..8db3f93b 100644 --- a/conf.py +++ b/conf.py @@ -1,6 +1,6 @@ """ This file is part of GNU TALER. - Copyright (C) 2014, 2015 GNUnet e.V. and INRIA + Copyright (C) 2014, 2015, 2016 GNUnet e.V. and INRIA TALER 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, or (at your option) any later version. @@ -9,6 +9,11 @@ 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 TALER; see the file COPYING. If not, see + + @author Florian Dold + @author Benedikt Muller + @author Sree Harsha Totakura + @author Marcello Stanisci """ # -*- coding: utf-8 -*- # diff --git a/dev-wallet-wx.rst b/dev-wallet-wx.rst index 387583e6..8a925ecd 100644 --- a/dev-wallet-wx.rst +++ b/dev-wallet-wx.rst @@ -1,6 +1,6 @@ .. This file is part of GNU TALER. - Copyright (C) 2014, 2015 GNUnet e.V. and INRIA + Copyright (C) 2014, 2015, 2016 INRIA TALER 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, or (at your option) any later version. @@ -10,6 +10,8 @@ You should have received a copy of the GNU Lesser General Public License along with TALER; see the file COPYING. If not, see + @author Florian Dold + ===================== WebExtensions Wallet ===================== diff --git a/example-essay-store.rst b/example-essay-store.rst index e969ab6a..1f33e141 100644 --- a/example-essay-store.rst +++ b/example-essay-store.rst @@ -1,6 +1,6 @@ .. This file is part of GNU TALER. - Copyright (C) 2014, 2015 GNUnet e.V. and INRIA + Copyright (C) 2014, 2015, 2016 INRIA TALER 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, or (at your option) any later version. @@ -10,6 +10,8 @@ You should have received a copy of the GNU Lesser General Public License along with TALER; see the file COPYING. If not, see + @author Florian Dold + ================================== Example: Essay Store ================================== diff --git a/exts/tsref.py b/exts/tsref.py index 5d56ee0a..91574929 100644 --- a/exts/tsref.py +++ b/exts/tsref.py @@ -9,6 +9,8 @@ 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 TALER; see the file COPYING. If not, see + + @author Florian Dold """ """ diff --git a/glossary.rst b/glossary.rst index 9c35610e..b3aa5e01 100644 --- a/glossary.rst +++ b/glossary.rst @@ -1,6 +1,6 @@ .. This file is part of GNU TALER. - Copyright (C) 2014, 2015 GNUnet e.V. and INRIA + Copyright (C) 2014, 2015, 2016 INRIA TALER 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, or (at your option) any later version. @@ -10,6 +10,8 @@ You should have received a copy of the GNU Lesser General Public License along with TALER; see the file COPYING. If not, see + @author Florian Dold + ============== Taler Glossary ============== diff --git a/impl-merchant.rst b/impl-merchant.rst index 76ed9534..a066dcc7 100644 --- a/impl-merchant.rst +++ b/impl-merchant.rst @@ -1,6 +1,6 @@ .. This file is part of GNU TALER. - Copyright (C) 2014, 2015 GNUnet e.V. and INRIA + Copyright (C) 2014, 2015, 2016 INRIA TALER 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, or (at your option) any later version. @@ -10,6 +10,9 @@ You should have received a copy of the GNU Lesser General Public License along with TALER; see the file COPYING. If not, see + @author Marcello Stanisci + @author Florian Dold + ================================= Merchant Reference Implementation ================================= diff --git a/impl-mint.rst b/impl-mint.rst index c971e34a..e824c213 100644 --- a/impl-mint.rst +++ b/impl-mint.rst @@ -1,6 +1,6 @@ .. This file is part of GNU TALER. - Copyright (C) 2014, 2015 GNUnet e.V. and INRIA + Copyright (C) 2014, 2015, 2016 GNUnet e.V. and INRIA TALER 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, or (at your option) any later version. @@ -10,6 +10,8 @@ You should have received a copy of the GNU Lesser General Public License along with TALER; see the file COPYING. If not, see + @author Christian Grothoff + =================================== The Exchange Reference Implementation =================================== diff --git a/index.rst b/index.rst index d1db3af9..0d18dbd6 100644 --- a/index.rst +++ b/index.rst @@ -1,6 +1,6 @@ .. This file is part of GNU TALER. - Copyright (C) 2014, 2015 GNUnet e.V. and INRIA + Copyright (C) 2014, 2015, 2016 GNUnet e.V. TALER 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, or (at your option) any later version. @@ -10,6 +10,10 @@ You should have received a copy of the GNU Lesser General Public License along with TALER; see the file COPYING. If not, see + @author Florian Dold + @author Benedikt Muller + @author Sree Harsha Totakura + GNU Taler Documentation ======================= diff --git a/licensing.rst b/licensing.rst new file mode 100644 index 00000000..e4a8e249 --- /dev/null +++ b/licensing.rst @@ -0,0 +1,31 @@ +--------- +Licensing +--------- + +This project has been jointly developed by INRIA and by individuals +being under the juridical subject called 'GNUnet e.V.'. For each source +file, the header indicated whose is holding the copyright, since some +parts have been taken "verbatim" from the GNUnet e.V. licensed code, and +some other have been developed at INRIA "ex novo". + +Source files of interest are located in the following directories: +(The repository could contain also scaffolded autogenerated files, +which do not have legal significance in this context) + +* current directory +* exts/ + +-------------------- +Runtime dependencies +-------------------- +We list as 'runtime dependencies' + +* shared libraries (namely \*.so files) +* running services (like databases) +* languages interpreters (like PHP) + +The following list encompasses all the runtime dependencies for this project, +and gives the copyright holder for each of them + +* Sphinx : Georg Brandl and the Sphinx team +* Python: Python Software Foundation -- cgit v1.2.3