From c3d06956ed4020edeed91bd8736b5faf846aef5a Mon Sep 17 00:00:00 2001 From: Paul Fitzpatrick Date: Mon, 29 Nov 2010 15:13:51 +0000 Subject: [PATCH] prep version 2.3.2 svn path=/trunk/yarp2/; revision=8386 --- COPYING | 240 +++++++++++++----------- ChangeLog | 6 +- conf/YarpVersion.cmake | 4 +- src/libYARP_OS/include/hmac/hmac_sha2.h | 3 + src/libYARP_OS/include/hmac/sha2.h | 3 + src/libYARP_OS/src/hmac_sha2.c | 3 + src/libYARP_OS/src/sha2.c | 3 + src/modules/laserHokuyo/CMakeLists.txt | 3 + 8 files changed, 152 insertions(+), 113 deletions(-) diff --git a/COPYING b/COPYING index 84e21cd77b6..89d36282be0 100644 --- a/COPYING +++ b/COPYING @@ -11,14 +11,15 @@ The list of authors for YARP (ordered by file count) is: Alexandre Bernardino Arjan Gijsberts Renaud Detry + Daniel Krieg Julio Gomes Ze Ji Mattia Castelnovi Francesco Nori - Daniel Krieg Carlos Beltran-Gonzalez Assif Mirza Ugo Pattacini + Marco Randazzo Jonas Ruesch Mike P. Blow Matteo Brunettini @@ -31,18 +32,20 @@ The list of authors for YARP (ordered by file count) is: 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 + Jonas Ruesch + Gianluca Massera + Anne van Rossum + Lorenzo Natale + Arnaud Degroote Arjan Gijsberts Ze Ji Stefan Freyr Stefansson Severin Lemaignan - Lorenzo Natale Frank Forster David Vernon + Daniel Krieg Assif Mirza Alexis Maldonado Alejandro R. Mosteo @@ -50,16 +53,15 @@ The list of people thanked in the ChangeLog (ordered by mention count) is: Tomassino Ferrauto Marco Barbosa Lorenz Mosenlechner + Lars Schillingmann Juan G Victores Giovanni Saponaro - Daniel Krieg Christian Wressnegger Breno Carneiro Pinheiro Baris Akgun - Arnaud Degroote Andrew Stout + Alexandre Bernardino Yianding - Ugo Pataccini Sergey Skachek Sebastien Gay Sebastian Wrede @@ -68,7 +70,7 @@ The list of people thanked in the ChangeLog (ordered by mention count) is: Pablo Urcola Nelson Goncalves Marco Randazzo - Lars Schillingmann + Leo Pape Kyron Du Casse Jan Woetzel Giorgio Metta @@ -77,15 +79,16 @@ The list of people thanked in the ChangeLog (ordered by mention count) is: Freyr Magnusson Francesco Rea Francesco Nori + Florent D'Halluin + Emanuel Sousa Dimitri Ognibene + Charles Lesire-Cabaniols 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: @@ -97,14 +100,15 @@ The list of copyright holders for YARP is: Giorgio Metta Alexandre Bernardino Renaud Detry + Daniel Krieg Arjan Gijsberts Ze Ji Mattia Castelnovi Julio Gomes - Daniel Krieg Carlos Beltran-Gonzalez Assif Mirza Alessandro Scalzo + Marco Randazzo Jonas Ruesch Mike P. Blow Matteo Brunettini @@ -116,55 +120,63 @@ Certain files are integrated in YARP from other sources with friendly licenses. Here is a list of these files and a summary of their copyright. See the individual files for more details. -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 +conf/YarpCheckStructHasMember.cmake + Copyright: 2007-2009 Kitware, Inc. + CopyPolicy: BSD -src/modules/jrkerr/nmccom.h - Copyright: (c) 2007 Jeffrey Kerr LLC - CopyPolicy: 3-clause BSD +conf/FindFFMPEG.cmake + Copyright: 1993-2008 Ken Martin, Will Schroeder, Bill Lorensen + CopyPolicy: BSD -src/modules/jrkerr/sio_util.cpp - Copyright: (c) 2007 Jeffrey Kerr LLC - CopyPolicy: 3-clause BSD +conf/YarpCheckTypeSize.cmake + Copyright: 2007-2009 Kitware, Inc. + CopyPolicy: BSD -src/modules/jrkerr/nmccom.cpp - Copyright: (c) 2007 Jeffrey Kerr LLC - CopyPolicy: 3-clause BSD +conf/FindGSL.cmake + Copyright: (C) 2010 Jan Woetzel + CopyPolicy: Use under LGPL or BSD license at your choice -src/modules/jrkerr/sio_util.h - Copyright: (c) 2007 Jeffrey Kerr LLC - CopyPolicy: 3-clause BSD +conf/FindBoost.cmake + Copyright: (c) 2006 Andreas Schneider + CopyPolicy: BSD -src/modules/jrkerr/picservo.cpp - Copyright: (c) 2007 Jeffrey Kerr LLC - CopyPolicy: 3-clause BSD +conf/FindOpenCV.cmake + Copyright: 2009 Benoit Rat + CopyPolicy: LGPLv2.1 -src/modules/jrkerr/picservo.h - Copyright: (c) 2007 Jeffrey Kerr LLC +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/include/hmac/hmac_sha2.h + Copyright: (C) 2005 Olivier Gay CopyPolicy: 3-clause BSD -src/modules/dimax_u2c/I2c.cpp - Copyright: (C)2004 Dimax ( http://www.xdimax.com ) - CopyPolicy: GPL +src/libYARP_OS/include/hmac/sha2.h + Copyright: (C) 2005, 2007 Olivier Gay + CopyPolicy: 3-clause BSD -src/modules/dimax_u2c/I2c.h - Copyright: (C)2004 Dimax ( http://www.xdimax.com ) - CopyPolicy: GPL +src/libYARP_OS/src/Random.cpp + Copyright: 1994, Everett F. Carter Jr. + CopyPolicy: Preserve copyright notice -src/modules/dimax_u2c/i2cbridge.h - Copyright: (C)2004 Dimax ( http://www.xdimax.com ) - CopyPolicy: GPL +src/libYARP_OS/src/hmac_sha2.c + Copyright: (C) 2005 Olivier Gay + CopyPolicy: 3-clause BSD -src/modules/dimax_u2c/u2c_common_func.h - Copyright: (C)2004 Dimax ( http://www.xdimax.com ) - CopyPolicy: GPL +src/libYARP_OS/src/sha2.c + Copyright: (C) 2005, 2007 Olivier Gay + CopyPolicy: 3-clause BSD -src/modules/urbtc/README.TXT - Copyright: (C) 2007 iXs Research Corp - CopyPolicy: Released under the terms of the GNU GPL version 2 +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/README.TXT +src/modules/urbtc/kernel_module/urobotc.h Copyright: (C) 2007 iXs Research Corp CopyPolicy: Released under the terms of the GNU GPL version 2 @@ -172,7 +184,7 @@ 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 +src/modules/urbtc/kernel_module/README.TXT Copyright: (C) 2007 iXs Research Corp CopyPolicy: Released under the terms of the GNU GPL version 2 @@ -180,6 +192,34 @@ 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/urbtc/README.TXT + 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 + +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 + +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 @@ -188,11 +228,23 @@ 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/modules/dimax_u2c/i2cbridge.h + Copyright: (C)2004 Dimax ( http://www.xdimax.com ) + CopyPolicy: GPL -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcServerMethod.cpp +src/modules/dimax_u2c/I2c.h + Copyright: (C)2004 Dimax ( http://www.xdimax.com ) + CopyPolicy: GPL + +src/modules/dimax_u2c/u2c_common_func.h + Copyright: (C)2004 Dimax ( http://www.xdimax.com ) + CopyPolicy: GPL + +src/modules/dimax_u2c/I2c.cpp + 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 @@ -200,47 +252,43 @@ 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/XmlRpcDispatch.h +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/XmlRpcServer.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/XmlRpcUtil.h +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/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/XmlRpcServerMethod.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/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/XmlRpcDispatch.cpp +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/XmlRpcClient.cpp - 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/XmlRpcClient.h +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/XmlRpcValue.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/XmlRpcSocket.cpp +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 @@ -252,61 +300,29 @@ 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 -src/carriers/xmlrpc_carrier/xmlrpc/XmlRpcSource.h +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/XmlRpcException.h +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/carriers/xmlrpc_carrier/xmlrpc/XmlRpcValue.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/XmlRpcSource.cpp +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/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 +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 -LGPL.TXT - Copyright: (C) 1991, 1999 Free Software Foundation, Inc. - CopyPolicy: copying and distributing verbatim copies allowed +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 example/gtk/gtkdemo.cpp Copyright: 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald @@ -320,3 +336,7 @@ GPL.TXT Copyright: (C) 1989, 1991 Free Software Foundation, Inc., CopyPolicy: copying and distributing verbatim copies allowed +LGPL.TXT + Copyright: (C) 1991, 1999 Free Software Foundation, Inc. + CopyPolicy: copying and distributing verbatim copies allowed + diff --git a/ChangeLog b/ChangeLog index c083c853c94..80f76ecbefc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-11-29 Paul Fitzpatrick + + * conf/YarpVersion.cmake: bump version to 2.3.2 + 2010-11-26 Paul Fitzpatrick * src/libYARP_dev/src/ServerControlBoard.cpp: when YARP_QUIET @@ -3429,7 +3433,7 @@ questions from someone evaluating YARP. * src/libYARP_dev/src/opencv_grabber: Added --loop option for - opencv_grabber, [thanks Alex Bernardino] for suggestion. + opencv_grabber, [thanks Alexandre Bernardino] for suggestion. 2006-12-15 Paul Fitzpatrick diff --git a/conf/YarpVersion.cmake b/conf/YarpVersion.cmake index dd8aca7948c..9ec28d03725 100644 --- a/conf/YarpVersion.cmake +++ b/conf/YarpVersion.cmake @@ -6,9 +6,9 @@ set(YARP_VERSION_MAJOR "2") set(YARP_VERSION_MINOR "3") -set(YARP_VERSION_PATCH "1") +set(YARP_VERSION_PATCH "2") set(YARP_VERSION_MODIFIER "") -set(YARP_VERSION_ABI "0") +set(YARP_VERSION_ABI "1") set(CPACK_PACKAGE_VERSION_MAJOR "${YARP_VERSION_MAJOR}") set(CPACK_PACKAGE_VERSION_MINOR "${YARP_VERSION_MINOR}") diff --git a/src/libYARP_OS/include/hmac/hmac_sha2.h b/src/libYARP_OS/include/hmac/hmac_sha2.h index e41f5f004bb..d6691159a18 100644 --- a/src/libYARP_OS/include/hmac/hmac_sha2.h +++ b/src/libYARP_OS/include/hmac/hmac_sha2.h @@ -31,6 +31,9 @@ * SUCH DAMAGE. */ +// License summary for YARP +// CopyPolicy: 3-clause BSD + #ifndef _HMAC_SHA2_H #define _HMAC_SHA2_H diff --git a/src/libYARP_OS/include/hmac/sha2.h b/src/libYARP_OS/include/hmac/sha2.h index 60f52e34d4b..f4dc06ba97e 100644 --- a/src/libYARP_OS/include/hmac/sha2.h +++ b/src/libYARP_OS/include/hmac/sha2.h @@ -31,6 +31,9 @@ * SUCH DAMAGE. */ +// License summary for YARP +// CopyPolicy: 3-clause BSD + #ifndef SHA2_H #define SHA2_H diff --git a/src/libYARP_OS/src/hmac_sha2.c b/src/libYARP_OS/src/hmac_sha2.c index 35f07736dcb..8ef933523ea 100644 --- a/src/libYARP_OS/src/hmac_sha2.c +++ b/src/libYARP_OS/src/hmac_sha2.c @@ -31,6 +31,9 @@ * SUCH DAMAGE. */ +// License summary for YARP +// CopyPolicy: 3-clause BSD + #include #include diff --git a/src/libYARP_OS/src/sha2.c b/src/libYARP_OS/src/sha2.c index 3e0bccd4eb4..4aa69846dde 100644 --- a/src/libYARP_OS/src/sha2.c +++ b/src/libYARP_OS/src/sha2.c @@ -31,6 +31,9 @@ * SUCH DAMAGE. */ +// License summary for YARP +// CopyPolicy: 3-clause BSD + #if 0 #define UNROLL_LOOPS /* Enable loops unrolling */ #endif diff --git a/src/modules/laserHokuyo/CMakeLists.txt b/src/modules/laserHokuyo/CMakeLists.txt index 31040a72daf..185514ea7a2 100644 --- a/src/modules/laserHokuyo/CMakeLists.txt +++ b/src/modules/laserHokuyo/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2010 Marco Randazzo +# CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT + IF (COMPILE_DEVICE_LIBRARY) PREPARE_DEVICE(laserHokuyo TYPE laserHokuyo INCLUDE laserHokuyo.h) ENDIF (COMPILE_DEVICE_LIBRARY)