From 95b794df9a49bb56f4c6459cef4bcb85edab2e8e Mon Sep 17 00:00:00 2001 From: Paul Fitzpatrick Date: Fri, 27 May 2011 15:15:21 +0000 Subject: [PATCH] prep release 2.3.4 svn path=/trunk/yarp2/; revision=8613 --- COPYING | 56 +++++++++++++++++++----- ChangeLog | 4 ++ conf/YarpVersion.cmake | 2 +- conf/YarpWdk.cmake | 4 ++ example/cmake/versioned_yarp/main.cpp | 7 +++ packaging/linux/README.txt | 4 ++ packaging/windows/README.txt | 4 ++ packaging/windows/src/gsl/CMakeLists.txt | 4 ++ scripts/admin/update-license | 5 ++- scripts/admin/update-license-single | 6 +++ 10 files changed, 83 insertions(+), 13 deletions(-) diff --git a/COPYING b/COPYING index 9d1c236066c..2456b9813d7 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,5 @@ Unless otherwise stated, files in YARP are: - Copyright: 2010 Paul Fitzpatrick, Lorenzo, Natale, Giorgio Metta + Copyright: 2011 Paul Fitzpatrick, Lorenzo, Natale, Giorgio Metta Released under the GNU LGPLv2.1 or later - see LGPL.TXT for details. The list of authors for YARP (ordered by file count) is: @@ -8,10 +8,11 @@ The list of authors for YARP (ordered by file count) is: Giorgio Metta Giacomo Spigler Alessandro Scalzo + Anne van Rossum + Daniel Krieg Alexandre Bernardino Arjan Gijsberts Renaud Detry - Daniel Krieg Julio Gomes Ze Ji Mattia Castelnovi @@ -27,41 +28,48 @@ The list of authors for YARP (ordered by file count) is: Gianluca Massera Freyr Magnusson Eric Mislivec + Paul Fitzpatick Hatice Kose-Bagci Claudio Castellini The list of people thanked in the ChangeLog (ordered by mention count) is: + Lorenzo Natale Philipp Robbel Ugo Pattacini Stephane Lallee Jonas Ruesch Gianluca Massera Anne van Rossum - Lorenzo Natale - Arnaud Degroote + Daniel Krieg Arjan Gijsberts + Giorgio Metta + Arnaud Degroote Ze Ji Stefan Freyr Stefansson Severin Lemaignan + Juan G Victores + Giovanni Saponaro Frank Forster David Vernon - Daniel Krieg Assif Mirza Alexis Maldonado + Alessandro Scalzo Alejandro R. Mosteo Vadim Tikhanoff Tomassino Ferrauto + Martin Peniak Marco Barbosa Lorenz Mosenlechner Lars Schillingmann - Juan G Victores - Giovanni Saponaro Christian Wressnegger Breno Carneiro Pinheiro Baris Akgun Andrew Stout + Andrea Del Prete Alexandre Bernardino Yianding + Varun Kompella + Valerio Sperati Sergey Skachek Sebastien Gay Sebastian Wrede @@ -73,7 +81,6 @@ The list of people thanked in the ChangeLog (ordered by mention count) is: Leo Pape Kyron Du Casse Jan Woetzel - Giorgio Metta Gilberto Echeverria Giacomo Spigler Freyr Magnusson @@ -89,18 +96,18 @@ The list of people thanked in the ChangeLog (ordered by mention count) is: Anthony Truchet Andrew Dankers Andreu Corominas Murtra - Alessandro Scalzo The list of copyright holders for YARP is: - Copyright 2003 2005 2006 2007 2008 2009 2010 + Copyright 2003 2005 2006 2007 2008 2009 2010 2011 Paul Fitzpatrick RobotCub Consortium Giacomo Spigler Lorenzo Natale Giorgio Metta + Daniel Krieg + Anne van Rossum Alexandre Bernardino Renaud Detry - Daniel Krieg Arjan Gijsberts Ze Ji Mattia Castelnovi @@ -119,6 +126,9 @@ The list of copyright holders for YARP is: 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. +All files used in the default YARP build are compatible with the +LGPL. Optional modules may require use of YARP under the GPL, +rather than the LGPL. src/libYARP_sig/include/yarp/sig/IplImage.h Copyright: (C) 2000, Intel Corporation, all rights reserved. @@ -296,10 +306,22 @@ 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/TcpStream.cpp + Copyright: (C) 2010 Anne van Rossum + CopyPolicy: LGPL; non-binding note discouraging certain uses + +src/libYARP_OS/src/TcpConnector.cpp + Copyright: (C) 2010 Anne van Rossum + CopyPolicy: LGPL; non-binding note discouraging certain uses + src/libYARP_OS/src/hmac_sha2.c Copyright: (C) 2005 Olivier Gay CopyPolicy: 3-clause BSD +src/libYARP_OS/src/TcpAcceptor.cpp + Copyright: (C) 2010 Anne van Rossum + CopyPolicy: LGPL; non-binding note discouraging certain uses + src/libYARP_OS/src/sha2.c Copyright: (C) 2005, 2007 Olivier Gay CopyPolicy: 3-clause BSD @@ -316,6 +338,18 @@ src/libYARP_OS/include/hmac/hmac_sha2.h Copyright: (C) 2005 Olivier Gay CopyPolicy: 3-clause BSD +src/libYARP_OS/include/yarp/os/impl/TcpConnector.h + Copyright: (C) 2010 Anne van Rossum + CopyPolicy: LGPL; non-binding note discouraging certain uses + +src/libYARP_OS/include/yarp/os/impl/TcpAcceptor.h + Copyright: (C) 2010 Anne van Rossum + CopyPolicy: LGPL; non-binding note discouraging certain uses + +src/libYARP_OS/include/yarp/os/impl/TcpStream.h + Copyright: (C) 2010 Anne van Rossum + CopyPolicy: LGPL; non-binding note discouraging certain uses + 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. diff --git a/ChangeLog b/ChangeLog index a21a264cf5a..4b364f5d5c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-05-27 Paul Fitzpatrick + + * conf/YarpVersion.cmake: bump to version 2.3.4 + 2011-05-26 Marco Randazzo * src/libYARP_dev/include/yarp/dev/ControlBoardInterfaces.h diff --git a/conf/YarpVersion.cmake b/conf/YarpVersion.cmake index afbfda8071d..12885b8b6c1 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 "3") +set(YARP_VERSION_PATCH "4") set(YARP_VERSION_MODIFIER "") set(YARP_VERSION_ABI "1") diff --git a/conf/YarpWdk.cmake b/conf/YarpWdk.cmake index 2c90b10ca22..0b9f5a7f531 100755 --- a/conf/YarpWdk.cmake +++ b/conf/YarpWdk.cmake @@ -1,3 +1,7 @@ +# Copyright: (C) 2010 RobotCub Consortium +# Authors: Paul Fitzpatrick +# CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT + MACRO(WDK_SETUP WDK_BUILD WDK_TEMPLATE) set(WDK_SOURCE_LIST_RAW) set(WDK_INCLUDE_LIST_RAW) diff --git a/example/cmake/versioned_yarp/main.cpp b/example/cmake/versioned_yarp/main.cpp index c89ada6f738..fb4c16aaf98 100644 --- a/example/cmake/versioned_yarp/main.cpp +++ b/example/cmake/versioned_yarp/main.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright: (C) 2011 RobotCub Consortium + * Author: Paul Fitzpatrick + * CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT + */ + #include #include diff --git a/packaging/linux/README.txt b/packaging/linux/README.txt index 9eb198713fb..8d3780cb8c6 100644 --- a/packaging/linux/README.txt +++ b/packaging/linux/README.txt @@ -1,3 +1,7 @@ +# Copyright: (C) 2011 RobotCub Consortium +# Author: Paul Fitzpatrick +# CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT + Steps for generating binary packages. For personal work, it suffices just to do "make package" in YARP. diff --git a/packaging/windows/README.txt b/packaging/windows/README.txt index ff1da83f0e8..77af6724723 100644 --- a/packaging/windows/README.txt +++ b/packaging/windows/README.txt @@ -1,3 +1,7 @@ +# Copyright: (C) 2011 RobotCub Consortium +# Author: Paul Fitzpatrick +# CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT + Steps for generating binary packages. For personal work, it suffices just to do "make package" in YARP. diff --git a/packaging/windows/src/gsl/CMakeLists.txt b/packaging/windows/src/gsl/CMakeLists.txt index 4d985054b7e..093d2ce550d 100755 --- a/packaging/windows/src/gsl/CMakeLists.txt +++ b/packaging/windows/src/gsl/CMakeLists.txt @@ -1,3 +1,7 @@ +# Copyright: (C) 2011 RobotCub Consortium +# Author: Paul Fitzpatrick +# CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT + cmake_minimum_required(VERSION 2.6) project(gsl C) diff --git a/scripts/admin/update-license b/scripts/admin/update-license index 9c76073c864..628aef87d48 100755 --- a/scripts/admin/update-license +++ b/scripts/admin/update-license @@ -50,7 +50,7 @@ grep -i -o "\[thanks [^]]*\]" ChangeLog | sed "s/^.thanks //i" | sed "s/\]//" > cat<