summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--OWNERS.rst20
-rw-r--r--api-bank.rst4
-rw-r--r--api-common.rst4
-rw-r--r--api-merchant.rst5
-rw-r--r--api-mint.rst4
-rw-r--r--conf.py7
-rw-r--r--dev-wallet-wx.rst4
-rw-r--r--example-essay-store.rst4
-rw-r--r--exts/tsref.py2
-rw-r--r--glossary.rst4
-rw-r--r--impl-merchant.rst5
-rw-r--r--impl-mint.rst4
-rw-r--r--index.rst6
-rw-r--r--licensing.rst31
14 files changed, 73 insertions, 31 deletions
diff --git a/OWNERS.rst b/OWNERS.rst
deleted file mode 100644
index dcb3abd..0000000
--- 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 d7a8a20..3cfbcc3 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 <http://www.gnu.org/licenses/>
+
+ @author Marcello Stanisci
=========
Bank API
diff --git a/api-common.rst b/api-common.rst
index 788a678..0a74aee 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 <http://www.gnu.org/licenses/>
+ @author Christian Grothoff
+
.. _http-common:
=================================
diff --git a/api-merchant.rst b/api-merchant.rst
index ba83cd0..9dfee37 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 <http://www.gnu.org/licenses/>
+ @author Florian Dold
+ @author Marcello Stanisci
+
=====================
The Merchant HTTP API
=====================
diff --git a/api-mint.rst b/api-mint.rst
index bfb48db..6c629a0 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 <http://www.gnu.org/licenses/>
+ @author Christian Grothoff
+
=========================
The Exchange RESTful JSON API
=========================
diff --git a/conf.py b/conf.py
index 18cb513..8db3f93 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 <http://www.gnu.org/licenses/>
+
+ @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 387583e..8a925ec 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 <http://www.gnu.org/licenses/>
+ @author Florian Dold
+
=====================
WebExtensions Wallet
=====================
diff --git a/example-essay-store.rst b/example-essay-store.rst
index e969ab6..1f33e14 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 <http://www.gnu.org/licenses/>
+ @author Florian Dold
+
==================================
Example: Essay Store
==================================
diff --git a/exts/tsref.py b/exts/tsref.py
index 5d56ee0..9157492 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 <http://www.gnu.org/licenses/>
+
+ @author Florian Dold
"""
"""
diff --git a/glossary.rst b/glossary.rst
index 9c35610..b3aa5e0 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 <http://www.gnu.org/licenses/>
+ @author Florian Dold
+
==============
Taler Glossary
==============
diff --git a/impl-merchant.rst b/impl-merchant.rst
index 76ed953..a066dcc 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 <http://www.gnu.org/licenses/>
+ @author Marcello Stanisci
+ @author Florian Dold
+
=================================
Merchant Reference Implementation
=================================
diff --git a/impl-mint.rst b/impl-mint.rst
index c971e34..e824c21 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 <http://www.gnu.org/licenses/>
+ @author Christian Grothoff
+
===================================
The Exchange Reference Implementation
===================================
diff --git a/index.rst b/index.rst
index d1db3af..0d18dbd 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 <http://www.gnu.org/licenses/>
+ @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 0000000..e4a8e24
--- /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