[med-svn] [libvistaio] 01/04: Imported Upstream version 1.2.16
Gert Wollny
gert-guest at alioth.debian.org
Mon Oct 21 14:41:07 UTC 2013
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository libvistaio.
commit 15abcd83ed925ba3a8c8cac24010f0383da8e1ef
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Mon Oct 21 16:25:51 2013 +0200
Imported Upstream version 1.2.16
---
CMakeLists.txt | 6 ++--
COPYING | 64 ++++++++++++++++++++------------------
ChangeLog | 10 ++++++
vistaio/2dfield.c | 6 ++--
vistaio/2dspline.c | 4 +--
vistaio/3dfield.c | 2 +-
vistaio/history.c | 36 +++++++++++-----------
vistaio/type.c | 34 ++++++++++-----------
vistaio/vcplist.h | 6 ++--
vistaio/vfield2d.c | 3 +-
vistaio/vfield3d.c | 2 +-
vistaio/vfield3d.h | 6 ++--
vistaio/vspline2d.c | 7 ++---
vistaio/vspline2d.h | 4 ++-
vistaio_change_names.py | 78 -----------------------------------------------
15 files changed, 101 insertions(+), 167 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d62c464..0ab82c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,9 +25,9 @@ SET(VENDOR "Gert Wollny")
SET(PACKAGE_NAME "vistaio")
SET(MAJOR_VERSION 1)
SET(MINOR_VERSION 2)
-SET(MICRO_VERSION 15)
-SET(INTERFACE_AGE 1)
-SET(BINARY_AGE 1)
+SET(MICRO_VERSION 16)
+SET(INTERFACE_AGE 2)
+SET(BINARY_AGE 2)
INCLUDE(GNUInstallDirs)
diff --git a/COPYING b/COPYING
index 7100566..c8537bb 100644
--- a/COPYING
+++ b/COPYING
@@ -1,32 +1,36 @@
+All source code files are
-Copyright 1993, 1994 University of British Columbia
-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
-
-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.
+ Copyright 1993, 1994 University of British Columbia
+ 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
+
+ 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.
+
+with the exception of
+
+ vistaio/
+ 3dspline.c 2dfield.c 3dfield.c vcplist.* vfield2d.* vfield3d.* vspline2d.*
+
+which are
+
+ 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
+
+ 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 author makes no representations about the suitability
+ of this software for any purpose. It is provided "as is" without express or
+ implied warranty.
diff --git a/ChangeLog b/ChangeLog
index 33b85c9..c3997ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2.1.16
+
+ * Revert licenses of type.c and history.c to original by A. Pope
+ * Corret licenses in 2dspline.c, 3dfield.c. vcplist.*, vfield2d.*,
+ vfield3d.*, vspline2d.*
+ * remove vistaio_change_names.py because it doesn't make much
+ sense to distribute it always.
+ * correct license COYPING file to reflect what is given in the
+ source files.
+
2.1.15
* correct errors in the man pages
diff --git a/vistaio/2dfield.c b/vistaio/2dfield.c
index 47fa0ab..d3255e6 100644
--- a/vistaio/2dfield.c
+++ b/vistaio/2dfield.c
@@ -8,11 +8,11 @@
* 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
+ * 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.
*
- * Author: Gert Wollny, UPM
+ * Author: Gert Wollny <gw.fossdev at gmail.com>
*/
#include <vistaio/vistaio.h>
diff --git a/vistaio/2dspline.c b/vistaio/2dspline.c
index 0204c5f..5dde5f8 100644
--- a/vistaio/2dspline.c
+++ b/vistaio/2dspline.c
@@ -8,8 +8,8 @@
* 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
+ * 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.
*
* Author: Gert Wollny, UPM
diff --git a/vistaio/3dfield.c b/vistaio/3dfield.c
index dc69bfc..2c137fb 100644
--- a/vistaio/3dfield.c
+++ b/vistaio/3dfield.c
@@ -8,7 +8,7 @@
* 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 author makes no representations about the suitability
+ * 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.
*
diff --git a/vistaio/history.c b/vistaio/history.c
index f337285..055c736 100644
--- a/vistaio/history.c
+++ b/vistaio/history.c
@@ -1,23 +1,21 @@
/*
-* Copyrigh (C) 2004 Max-Planck-Institute of Cognitive Neurosience
-*
-* The origional VISTA library is copyrighted of University of British Columbia.
-* Copyright © 1993, 1994 University of British Columbia.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser Public License as published by
-* the Free Software Foundation; either version 2 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 Lesser Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
+ * Copyright 1993, 1994 University of British Columbia
+ * 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
+ *
+ * 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.
+ *
+ * Author: Arthur Pope, UBC Laboratory for Computational Intelligence
+ * Maintainance and Fixes: Gert Wollny, UPM
+ */
/* $Id: history.c 885 2006-02-27 10:13:57Z write1 $ */
diff --git a/vistaio/type.c b/vistaio/type.c
index d7dae6f..353d47f 100644
--- a/vistaio/type.c
+++ b/vistaio/type.c
@@ -1,21 +1,21 @@
/*
-*
-* Copyrigh (C) 2004 Max-Planck-Institute of Cognitive Neurosience
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser 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 Lesser Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
+ * Copyright 1993, 1994 University of British Columbia
+ * 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
+ *
+ * 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.
+ *
+ * Author: Arthur Pope, UBC Laboratory for Computational Intelligence
+ * Maintainance and Fixes: Gert Wollny, UPM
+ */
/*$Id: type.c 976 2007-04-02 10:40:26Z wollny $ */
diff --git a/vistaio/vcplist.h b/vistaio/vcplist.h
index d41bdf4..04270ba 100644
--- a/vistaio/vcplist.h
+++ b/vistaio/vcplist.h
@@ -8,11 +8,11 @@
* 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
+ * 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.
*
- * Author: Gert Wollny, UPM
+ * Author: Gert Wollny <gw.fossdev at gmail.com>
*/
#ifndef __VCPEList_h
diff --git a/vistaio/vfield2d.c b/vistaio/vfield2d.c
index a7e1b50..ead249d 100644
--- a/vistaio/vfield2d.c
+++ b/vistaio/vfield2d.c
@@ -8,12 +8,11 @@
* 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 author makes no representations about the suitability
+ * 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.
*
* Author: Gert Wollny <gw.fossdev at gmail.com>
- *
*/
#include <string.h>
diff --git a/vistaio/vfield3d.c b/vistaio/vfield3d.c
index 349180f..ef8950f 100644
--- a/vistaio/vfield3d.c
+++ b/vistaio/vfield3d.c
@@ -8,7 +8,7 @@
* 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 author makes no representations about the suitability
+ * 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.
*
diff --git a/vistaio/vfield3d.h b/vistaio/vfield3d.h
index d7982e8..1919c7e 100644
--- a/vistaio/vfield3d.h
+++ b/vistaio/vfield3d.h
@@ -8,11 +8,11 @@
* 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
+ * 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.
*
- * Author: Gert Wollny, UPM
+ * Author: Gert Wollny <gw.fossdev at gmail.com>
*/
#ifndef __VField3D_h
diff --git a/vistaio/vspline2d.c b/vistaio/vspline2d.c
index 0788160..0d3340b 100644
--- a/vistaio/vspline2d.c
+++ b/vistaio/vspline2d.c
@@ -1,5 +1,4 @@
/*
- * Copyright 1993, 1994 University of British Columbia
* Copyright (c) Leipzig, Madrid 2004 - 2012
* Max-Planck-Institute for Human Cognitive and Brain Science
* Max-Planck-Institute for Evolutionary Anthropology
@@ -9,11 +8,11 @@
* 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
+ * 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.
*
- * Author: Gert Wollny, UPM
+ * Author: Gert Wollny <gw.fossdev at gmail.com>
*/
#ifdef HAVE_CONFIG_H
diff --git a/vistaio/vspline2d.h b/vistaio/vspline2d.h
index cb4896d..2c761a7 100644
--- a/vistaio/vspline2d.h
+++ b/vistaio/vspline2d.h
@@ -1,12 +1,14 @@
/*
* 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
*
* 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 make no representations about the suitability
+ * 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.
*
diff --git a/vistaio_change_names.py b/vistaio_change_names.py
deleted file mode 100644
index 9315207..0000000
--- a/vistaio_change_names.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (C) 2011 Gert Wollny <gw.fossdev at gmail.com>
-#
-# 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 2 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.
-#
-
-import sys
-import re
-from os import rename
-import string
-from fnmatch import fnmatch
-from os.path import walk
-
-
-
-class CPatternCollector:
- def __init__(self, pattern):
- self.pattern = pattern
- self.files=[]
-
-
-def collect_files(arg, dirname, names):
- for f in names:
- for p in arg.pattern:
- if fnmatch(f, p):
- arg.files.append(dirname + "/" + f)
-
-
-
-def find_files(root, pattern):
- arg = CPatternCollector(pattern)
- walk(root, collect_files, arg)
- return arg.files
-
-
-root= sys.argv[1]
-files = find_files(root, ["*.C", "*.H", "*.c", "*.h", "*.cc", "*.hh", "*.cpp", "*.hpp"])
-
-
-# read all files and extract comment blocks
-for f in files:
-
- # ignore some emacs security copies
- h = re.search("/\.#[-a-z0-9]*\.[ch]*", f)
- if h:
- continue
-
-
-
- infile = open(f, "r");
- lines = infile.readlines()
- infile.close(),
-
- changed = False
- out_lines = []
- for l in lines:
- ol = re.sub("\\bV(_*[A-Z]*[a-z][a-zA-Z0-9_]*)\\b", "VistaIO\\1",l)
- out_lines.append(ol)
- changed = changed or (ol != l)
-
- if changed:
- print f, " updated"
- outfile = open(f, "w")
- outfile.writelines(out_lines)
- outfile.close();
- else:
- print f, " unchanged"
-
-
--
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/libvistaio.git
More information about the debian-med-commit
mailing list