[med-svn] [libvistaio] 03/04: correct copyright

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch master
in repository libvistaio.

commit eca136f1275a50c2d777ef1dd2affdee73f278c7
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Mon Oct 21 16:35:38 2013 +0200

    correct copyright
---
 debian/changelog |    7 +++++++
 debian/copyright |   51 +++++++++++++++++++++++++--------------------------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a3d252e..a32c3ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libvistaio (1.2.16-1) UNRELEASED; urgency=low
+
+  * new upstream release 
+  * corrected debian/copyright entries (Closes: #726778)
+
+ -- Gert Wollny <gw.fossdev at gmail.com>  Mon, 21 Oct 2013 16:30:11 +0200
+
 libvistaio (1.2.15-1) unstable; urgency=low
 
   * New upstream release that fixes spelling issues 
diff --git a/debian/copyright b/debian/copyright
index b5771e1..2eaf853 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,35 +4,34 @@ Source: http://sourceforge.net/projects/mia/files/vistaio/
 
 Files: *
 Copyright: Copyright 1993, 1994 University of British Columbia
-	   2004 - 2012 
+	   Copyright (c) Leipzig, Madrid 2004 - 2012 
 	   Max-Planck-Institute for Human Cognitive and Brain Science	
 	   Max-Planck-Institute for Evolutionary Anthropology 
 	   BIT, ETSI Telecomunicacion, UPM
-License: BSDlike
- 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.
-  * Neither the name of above organizations nor the names of its contributors 
-    may be used to endorse or promote products derived from this software 
-    without specific prior written permission.
- .
- 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 HOLDER 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.
+License: 
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appears in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation. UBC makes no representations about the suitability of this
+ software for any purpose. It is provided "as is" without express or
+ implied warranty.
+
+Files: vistaio/2dfield.c vistaio/2dspline.c vistaio/3dfield.c vistaio/vcplist.*
+       vistaio/vfield2d.* vistaio/vfield3d.* vistaio/vspline2d.*
+
+Copyright: Copyright (c) Leipzig, Madrid 2004 - 2012 
+	   Max-Planck-Institute for Human Cognitive and Brain Science	
+	   Max-Planck-Institute for Evolutionary Anthropology 
+	   BIT, ETSI Telecomunicacion, UPM
+License: 
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appears in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation. The authors makes no representations about the suitability 
+ of this software for any purpose. It is provided "as is" without express or
+ implied warranty.
 
 Files: debian/*
 Copyright: 2012 Gert Wollny <gw.fossdev at gmail.com>

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/libvistaio.git