Merge branch 'master' of git://git.debian.org/pkg-exppsy/neurodebian

[neurodebian.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 186258b6112f8938fd414eedc1b90f078fe0dbba..e9f10fbda3997139c66634889732c75868076352 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,16 +3,38 @@ Upstream-Name: NeuroDebian
 Upstream-Contact: NeuroDebian team <team@neuro.debian.net>
 Source-Location: http://git.debian.org/?p=pkg-exppsy/neurodebian.git
 
 Upstream-Contact: NeuroDebian team <team@neuro.debian.net>
 Source-Location: http://git.debian.org/?p=pkg-exppsy/neurodebian.git
 

-

 Files: *
 Files: *

-Copyright: 2009-2014 NeuroDebian Team
+Copyright: 2009-2014 NeuroDebian Team (Yaroslav Halchenko, Michael Hanke, et al.)

 License: GPL-3+
 License: GPL-3+

- On Debian systems the full text of the GNU General Public License can be found
- in the `/usr/share/common-licenses/GPL-3' file.

 
 Files: artwork/openlogo*.svg
 Copyright: 1999 Software in the Public Interest
 
 Files: artwork/openlogo*.svg
 Copyright: 1999 Software in the Public Interest

-License: MIT
+License: Expat
+
+Files: sphinx/sphinxext/quote.py
+Copyright: 2010, Yaroslav O. Halchenko
+           2007-2010, Sphinx team
+License: BSD-2
+
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+
+License: Expat

  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
  "Software"), to deal in the Software without restriction, including
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
  "Software"), to deal in the Software without restriction, including


@@ -32,3 +54,30 @@ License: MIT
  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.

+
+License: BSD-2
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ * 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.
+ .
+ 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 COPYRIGHT
+ OWNER 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 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+