Skip to content

Commit

Permalink
prep release 2.3.4
Browse files Browse the repository at this point in the history
svn path=/trunk/yarp2/; revision=8613
  • Loading branch information
paulfitz committed May 27, 2011
1 parent 2455bf1 commit 95b794d
Show file tree
Hide file tree
Showing 10 changed files with 83 additions and 13 deletions.
56 changes: 45 additions & 11 deletions COPYING
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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.
Expand Down Expand Up @@ -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 <anne@almende.com>
CopyPolicy: LGPL; non-binding note discouraging certain uses

src/libYARP_OS/src/TcpConnector.cpp
Copyright: (C) 2010 Anne van Rossum <anne@almende.com>
CopyPolicy: LGPL; non-binding note discouraging certain uses

src/libYARP_OS/src/hmac_sha2.c
Copyright: (C) 2005 Olivier Gay <olivier.gay@a3.epfl.ch>
CopyPolicy: 3-clause BSD

src/libYARP_OS/src/TcpAcceptor.cpp
Copyright: (C) 2010 Anne van Rossum <anne@almende.com>
CopyPolicy: LGPL; non-binding note discouraging certain uses

src/libYARP_OS/src/sha2.c
Copyright: (C) 2005, 2007 Olivier Gay <olivier.gay@a3.epfl.ch>
CopyPolicy: 3-clause BSD
Expand All @@ -316,6 +338,18 @@ src/libYARP_OS/include/hmac/hmac_sha2.h
Copyright: (C) 2005 Olivier Gay <olivier.gay@a3.epfl.ch>
CopyPolicy: 3-clause BSD

src/libYARP_OS/include/yarp/os/impl/TcpConnector.h
Copyright: (C) 2010 Anne van Rossum <anne@almende.com>
CopyPolicy: LGPL; non-binding note discouraging certain uses

src/libYARP_OS/include/yarp/os/impl/TcpAcceptor.h
Copyright: (C) 2010 Anne van Rossum <anne@almende.com>
CopyPolicy: LGPL; non-binding note discouraging certain uses

src/libYARP_OS/include/yarp/os/impl/TcpStream.h
Copyright: (C) 2010 Anne van Rossum <anne@almende.com>
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.
Expand Down
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2011-05-27 Paul Fitzpatrick <paulfitz@alum.mit.edu>

* conf/YarpVersion.cmake: bump to version 2.3.4

2011-05-26 Marco Randazzo <marco.randazzo@iit.it>

* src/libYARP_dev/include/yarp/dev/ControlBoardInterfaces.h
Expand Down
2 changes: 1 addition & 1 deletion conf/YarpVersion.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
4 changes: 4 additions & 0 deletions conf/YarpWdk.cmake
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
7 changes: 7 additions & 0 deletions example/cmake/versioned_yarp/main.cpp
Original file line number Diff line number Diff line change
@@ -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 <stdio.h>
#include <yarp/os/all.h>

Expand Down
4 changes: 4 additions & 0 deletions packaging/linux/README.txt
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 4 additions & 0 deletions packaging/windows/README.txt
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 4 additions & 0 deletions packaging/windows/src/gsl/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
5 changes: 4 additions & 1 deletion scripts/admin/update-license
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ grep -i -o "\[thanks [^]]*\]" ChangeLog | sed "s/^.thanks //i" | sed "s/\]//" >

cat<<EOF
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:
Expand Down Expand Up @@ -78,6 +78,9 @@ cat<<EOF
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.
EOF

Expand Down
6 changes: 6 additions & 0 deletions scripts/admin/update-license-single
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ if ($txt=~/academic free/i || $quiet) {
}
}

if ($txt=~/GNU Lesser General Public license/) {
if ($txt=~/we personally strongly object/) {
$policy = "LGPL; non-binding note discouraging certain uses";
}
}

if ($txt =~ /license/i || $txt =~ /copyright/i) {
}
Expand Down Expand Up @@ -89,6 +94,7 @@ if ($copyright =~ /RobotCub/i) {

$copyright =~ s/\s+$//g;
$copyright =~ s/^\s+//g;
$copyright =~ s/©/\(C\)/g;
$copyright =~ s/\xa9/\(C\)/g;
$policy =~ s/\s+$//g;
$policy =~ s/^\s+//g;
Expand Down

0 comments on commit 95b794d

Please sign in to comment.