diff --git a/COPYING b/COPYING index 3fa574bf880..84e21cd77b6 100644 --- a/COPYING +++ b/COPYING @@ -1,68 +1,125 @@ Unless otherwise stated, files in YARP are: - Copyright: 2010 Paul Fitzpatrick, Giorgio Metta, Lorenzo Natale + Copyright: 2010 Paul Fitzpatrick, Lorenzo, Natale, Giorgio Metta Released under the GNU LGPLv2.1 or later - see LGPL.TXT for details. -Contributed files in YARP are copyright of their authors, and -released under the same license. The author list for contributed -files follows. - -Copyright 2005 2006 2007 2008 2009 2010: +The list of authors for YARP (ordered by file count) is: + Paul Fitzpatrick + Lorenzo Natale + Giorgio Metta + Giacomo Spigler Alessandro Scalzo Alexandre Bernardino Arjan Gijsberts - Assif Mirza - Carlos Beltran-Gonzalez + Renaud Detry + Julio Gomes + Ze Ji + Mattia Castelnovi + Francesco Nori Daniel Krieg + Carlos Beltran-Gonzalez + Assif Mirza + Ugo Pattacini + Jonas Ruesch + Mike P. Blow + Matteo Brunettini + Lars Olsson + Gianluca Massera + Freyr Magnusson Eric Mislivec + Hatice Kose-Bagci + Claudio Castellini + +The list of people thanked in the ChangeLog (ordered by mention count) is: + Philipp Robbel + Jonas Ruesch + Anne van Rossum + Gianluca Massera + Ugo Pattacini + Stephane Lallee + Arjan Gijsberts + Ze Ji + Stefan Freyr Stefansson + Severin Lemaignan + Lorenzo Natale + Frank Forster + David Vernon + Assif Mirza + Alexis Maldonado + Alejandro R. Mosteo + Vadim Tikhanoff + Tomassino Ferrauto + Marco Barbosa + Lorenz Mosenlechner + Juan G Victores + Giovanni Saponaro + Daniel Krieg + Christian Wressnegger + Breno Carneiro Pinheiro + Baris Akgun + Arnaud Degroote + Andrew Stout + Yianding + Ugo Pataccini + Sergey Skachek + Sebastien Gay + Sebastian Wrede + Renaud Detry + Radu Bogdan Rusu + Pablo Urcola + Nelson Goncalves + Marco Randazzo + Lars Schillingmann + Kyron Du Casse + Jan Woetzel + Giorgio Metta + Gilberto Echeverria + Giacomo Spigler Freyr Magnusson + Francesco Rea + Francesco Nori + Dimitri Ognibene + Carlo Ciliberto + Bruno Nery + Boris Duran + Anthony Truchet + Andrew Dankers + Andreu Corominas Murtra + Alex Bernardino + Alexandre Bernardino + Alessandro Scalzo + +The list of copyright holders for YARP is: + Copyright 2003 2005 2006 2007 2008 2009 2010 + Paul Fitzpatrick + RobotCub Consortium Giacomo Spigler - Giorgio Metta - Jonas Ruesch - Julio Gomes - Lars Olsson Lorenzo Natale - Matteo Brunettini + Giorgio Metta + Alexandre Bernardino + Renaud Detry + Arjan Gijsberts + Ze Ji Mattia Castelnovi + Julio Gomes + Daniel Krieg + Carlos Beltran-Gonzalez + Assif Mirza + Alessandro Scalzo + Jonas Ruesch Mike P. Blow - Paul Fitzpatrick - RobotCub Consortium + Matteo Brunettini + Lars Olsson + Freyr Magnusson + Eric Mislivec Certain files are integrated in YARP from other sources with -compatible licenses. Here is a list of these files and a summary of +friendly licenses. Here is a list of these files and a summary of their copyright. See the individual files for more details. -src/yarpserver/sqlite/sqlite3.c - Copyright: The author disclaims copyright to this source code - CopyPolicy: In place of a legal notice, a blessing is given. - -src/yarpserver/sqlite/sqlite3.h - Copyright: The author disclaims copyright to this source code - CopyPolicy: In place of a legal notice, a blessing is given. - -src/libYARP_OS/src/Random.cpp - Copyright: 1994, Everett F. Carter Jr. - CopyPolicy: Preserve copyright notice - src/libYARP_sig/include/yarp/sig/IplImage.h Copyright: (C) 2000, Intel Corporation, all rights reserved. CopyPolicy: Intel License Agreement For Open Source Computer Vision Library -src/modules/urbtc/kernel_module/urobotc.h - Copyright: (C) 2007 iXs Research Corp - CopyPolicy: Released under the terms of the GNU GPL version 2 - -src/modules/urbtc/kernel_module/urbtc.c - Copyright: (C) 2001-2004 Greg Kroah-Hartman (greg@kroah.com) - CopyPolicy: Released under the terms of the GNU GPL version 2 - -src/modules/urbtc/kernel_module/urbtc.h - Copyright: (C) 2007 iXs Research Corp - CopyPolicy: Released under the terms of the GNU GPL version 2 - -src/modules/jrkerr/picservo.h - Copyright: (c) 2007 Jeffrey Kerr LLC - CopyPolicy: 3-clause BSD - src/modules/jrkerr/nmccom.h Copyright: (c) 2007 Jeffrey Kerr LLC CopyPolicy: 3-clause BSD @@ -71,10 +128,6 @@ src/modules/jrkerr/sio_util.cpp Copyright: (c) 2007 Jeffrey Kerr LLC CopyPolicy: 3-clause BSD -src/modules/jrkerr/picservo.cpp - Copyright: (c) 2007 Jeffrey Kerr LLC - CopyPolicy: 3-clause BSD - src/modules/jrkerr/nmccom.cpp Copyright: (c) 2007 Jeffrey Kerr LLC CopyPolicy: 3-clause BSD @@ -83,15 +136,15 @@ src/modules/jrkerr/sio_util.h Copyright: (c) 2007 Jeffrey Kerr LLC CopyPolicy: 3-clause BSD -src/modules/vfw/vfw_extra_from_australia.h - Copyright: (C) 2006 The University of Queensland, Australia - CopyPolicy: Released under the terms of the GNU GPL v2. or later +src/modules/jrkerr/picservo.cpp + Copyright: (c) 2007 Jeffrey Kerr LLC + CopyPolicy: 3-clause BSD -src/modules/vfw/vfw_extra_from_wine.h - Copyright: (C) 2007 the Wine project - CopyPolicy: Released under the terms of the GNU GPL v2.1. or later +src/modules/jrkerr/picservo.h + Copyright: (c) 2007 Jeffrey Kerr LLC + CopyPolicy: 3-clause BSD -src/modules/dimax_u2c/i2cbridge.h +src/modules/dimax_u2c/I2c.cpp Copyright: (C)2004 Dimax ( http://www.xdimax.com ) CopyPolicy: GPL @@ -99,79 +152,103 @@ src/modules/dimax_u2c/I2c.h Copyright: (C)2004 Dimax ( http://www.xdimax.com ) CopyPolicy: GPL -src/modules/dimax_u2c/u2c_common_func.h +src/modules/dimax_u2c/i2cbridge.h Copyright: (C)2004 Dimax ( http://www.xdimax.com ) CopyPolicy: GPL -src/modules/dimax_u2c/I2c.cpp +src/modules/dimax_u2c/u2c_common_func.h Copyright: (C)2004 Dimax ( http://www.xdimax.com ) CopyPolicy: GPL -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcServerMethod.h - Copyright: 2002, 2003 Chris Morley - CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT +src/modules/urbtc/README.TXT + Copyright: (C) 2007 iXs Research Corp + CopyPolicy: Released under the terms of the GNU GPL version 2 -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcServer.h +src/modules/urbtc/kernel_module/README.TXT + Copyright: (C) 2007 iXs Research Corp + CopyPolicy: Released under the terms of the GNU GPL version 2 + +src/modules/urbtc/kernel_module/urbtc.c + Copyright: (C) 2001-2004 Greg Kroah-Hartman (greg@kroah.com) + CopyPolicy: Released under the terms of the GNU GPL version 2 + +src/modules/urbtc/kernel_module/urobotc.h + Copyright: (C) 2007 iXs Research Corp + CopyPolicy: Released under the terms of the GNU GPL version 2 + +src/modules/urbtc/kernel_module/urbtc.h + Copyright: (C) 2007 iXs Research Corp + CopyPolicy: Released under the terms of the GNU GPL version 2 + +src/modules/vfw/vfw_extra_from_australia.h + Copyright: (C) 2006 The University of Queensland, Australia + CopyPolicy: Released under the terms of the GNU GPL v2. or later + +src/modules/vfw/vfw_extra_from_wine.h + Copyright: (C) 2007 the Wine project + CopyPolicy: Released under the terms of the GNU GPL v2.1. or later + +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcUtil.cpp Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcDispatch.cpp +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcServerMethod.cpp Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcValue.cpp +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcServer.h Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcUtil.cpp +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcDispatch.h Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcClient.cpp +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcServer.cpp Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcValue.h +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcUtil.h Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcUtil.h +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcServerConnection.cpp Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcClient.h - Copyright: (c) 2002-2003 by Chris Morley +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcServerMethod.h + Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT src/carriers/xmlrpc_carrier/xmlrpc/XmlRpc.h Copyright: (c) 2002-2003 by Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcSocket.cpp +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcDispatch.cpp Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcServerConnection.cpp +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcClient.cpp Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcSocket.h - Copyright: 2002, 2003 Chris Morley +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcClient.h + Copyright: (c) 2002-2003 by Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcServerConnection.h +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcValue.h Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcException.h +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcSocket.cpp Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcSource.cpp +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcSocket.h Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcDispatch.h +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcServerConnection.h Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT @@ -179,11 +256,67 @@ src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcSource.h Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcServer.cpp +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcException.h Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcServerMethod.cpp +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcValue.cpp Copyright: 2002, 2003 Chris Morley CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT +src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcSource.cpp + Copyright: 2002, 2003 Chris Morley + CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT + +src/libYARP_OS/src/Random.cpp + Copyright: 1994, Everett F. Carter Jr. + CopyPolicy: Preserve copyright notice + +src/yarpserver/sqlite/sqlite3.h + Copyright: The author disclaims copyright to this source code + CopyPolicy: In place of a legal notice, a blessing is given. + +src/yarpserver/sqlite/sqlite3.c + Copyright: The author disclaims copyright to this source code + CopyPolicy: In place of a legal notice, a blessing is given. + +conf/YarpCheckStructHasMember.cmake + Copyright: 2007-2009 Kitware, Inc. + CopyPolicy: BSD + +conf/FindBoost.cmake + Copyright: (c) 2006 Andreas Schneider + CopyPolicy: BSD + +conf/FindGSL.cmake + Copyright: (C) 2010 Jan Woetzel + CopyPolicy: Use under LGPL or BSD license at your choice + +conf/FindFFMPEG.cmake + Copyright: 1993-2008 Ken Martin, Will Schroeder, Bill Lorensen + CopyPolicy: BSD + +conf/FindOpenCV.cmake + Copyright: 2009 Benoit Rat + CopyPolicy: LGPLv2.1 + +conf/YarpCheckTypeSize.cmake + Copyright: 2007-2009 Kitware, Inc. + CopyPolicy: BSD + +LGPL.TXT + Copyright: (C) 1991, 1999 Free Software Foundation, Inc. + CopyPolicy: copying and distributing verbatim copies allowed + +example/gtk/gtkdemo.cpp + Copyright: 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + CopyPolicy: GPLv2 or later + +example/yayarpview/CImg.h + Copyright: 2004 David Tschumperle + CopyPolicy: CeCILL license (use, modify, redistribute) + +GPL.TXT + Copyright: (C) 1989, 1991 Free Software Foundation, Inc., + CopyPolicy: copying and distributing verbatim copies allowed + diff --git a/ChangeLog b/ChangeLog index fce18d5639c..343510c7651 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2010-09-21 Paul Fitzpatrick + * conf/YarpVersion.cmake: bump version up to 2.3.1 + * conf/FindGSL.cmake: clean up license statement on this file [thanks Jan Woetzel]! diff --git a/conf/YarpVersion.cmake b/conf/YarpVersion.cmake index 1e0b4657cea..dd8aca7948c 100644 --- a/conf/YarpVersion.cmake +++ b/conf/YarpVersion.cmake @@ -6,7 +6,7 @@ set(YARP_VERSION_MAJOR "2") set(YARP_VERSION_MINOR "3") -set(YARP_VERSION_PATCH "0") +set(YARP_VERSION_PATCH "1") set(YARP_VERSION_MODIFIER "") set(YARP_VERSION_ABI "0") diff --git a/scripts/admin/README.TXT b/scripts/admin/README.TXT index 2aeb9b415f3..711c86570a0 100644 --- a/scripts/admin/README.TXT +++ b/scripts/admin/README.TXT @@ -18,7 +18,11 @@ How to make a YARP release: * If license-statement.txt is correct, do: cp license-statement.txt COPYING - And commit. + +* Update version number in conf/YarpVersion.cmake and add a ChangeLog + entry saying "bump" on that file + +* Commit. * Look at this page to get the current YARP version, say 2.1.6: