Skip to content

Commit

Permalink
version 2.1 copy cleaning
Browse files Browse the repository at this point in the history
svn path=/trunk/yarp2/; revision=4247
  • Loading branch information
paulfitz committed Oct 25, 2006
1 parent 9499fad commit 24ad91f
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 12 deletions.
30 changes: 30 additions & 0 deletions COPYRIGHT
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

The code in YARP is the copyright of its individual authors.
See individual source code files for a copyright statement.

YARP is licensed using the GNU Public License, version 2 - see COPYING
for details.

Certain files are integrated in YARP2 from other sources (with
compatible licenses). Here is a list of these files and a summary of
their copyright. See the individual files for more details.

example/yayarpview/CImg.h
Copyright: David Tschumperle
CopyPolicy: CeCILL license (use, modify, redistribute)

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/libYARP_OS/src/Random.cpp
Copyright: 1994, Everett F. Carter Jr.
CopyPolicy: Preserve copyright notice

src/libYARP_sig/src/SoundFile.cpp
Copyright: 1998,1999 Heiko Eissfeldt
CopyPolicy: GNU Public License 2 applies



5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2006-10-25 Paul Fitzpatrick <[email protected]>

* Bumped version up to 2.1.0
* Consistent GPL licensing, copyright statements

2006-10-24 Paul Fitzpatrick <[email protected]>

* License comments updated, removed older references to AFL
Expand Down
3 changes: 2 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ This is YARP2, a new version of the YARP robot library set.
It helps do stuff with robots (or avoid doing stuff with robots by
spending your time writing libraries).

License and copyright information is in COPYING.
License information is in COPYING.
Copyright information is in COPYRIGHT.

===============================================================================

22 changes: 13 additions & 9 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,28 @@ __ __ ___ ____ ____ ___
/ // ___ | / _, _// ____// __/
/_//_/ |_|/_/ |_|/_/ /____/

Welcome to YARP2.
Welcome to YARP.

License and copyright information is in COPYING.
Author list is in AUTHORS.
YARP is a library and toolkit for communication and device interfaces
for humanoid robots.

Material included in YARP is copyright its authors -- please read COPYRIGHT.
See COPYING for use, distribution, and modification rights (summary: GPLv2).
See AUTHORS for a list of contributors to YARP.

===============================================================================

COMPILATION and INSTALLATION
INSTALLATION and COMPILATION
----------------------------

There are a few different ways to compile YARP2.
There are a few different ways to compile YARP.

See if there is a file called "QUICKSTART". If so, then you have a
distribution of YARP tailored to your specific operating system,
and the instructions in this file will give the fastest way
to get going.

We now describe two general methods for compiling YARP2: "cmake" and
We now describe two general methods for compiling YARP: "cmake" and
"autoconf".

If you are using some version of Microsoft Windows, we recommend cmake
Expand All @@ -39,7 +43,7 @@ If all else fails, you can fall back on autoconf.
PREREQUISITES *** important! read this! ***
-------------

YARP2 depends on the ACE communications library. Make sure you install
YARP depends on the ACE communications library. Make sure you install
ACE before following any of the steps below. See:
http://www.cs.wustl.edu/~schmidt/ACE.html
for download and installation instructions. Some linux distributions
Expand Down Expand Up @@ -87,7 +91,7 @@ Download cmake from www.cmake.org or install it as a package if available
for your system.


In Linux, in the YARP2 directory, type:
In Linux, in the YARP directory, type:

cmake . (or "ccmake ." for a graphical interface)
make
Expand All @@ -100,7 +104,7 @@ In Linux, in the YARP2 directory, type:


In Microsoft Windows, run cmake, answer "Where is the source code" by
browsing to the YARP2 directory.
browsing to the YARP directory.

* Note: in Microsoft Windows your can run cmake as a GUI (by clicking
on the appropriate icon) or from the command line. We recommend
Expand Down
4 changes: 2 additions & 2 deletions conf/YarpVersion.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "0")
SET(CPACK_PACKAGE_VERSION_PATCH "9")
SET(CPACK_PACKAGE_VERSION_MINOR "1")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
2 changes: 2 additions & 0 deletions conf/build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ DOC SOURCE DEBIAN Thu Oct 12 17:37:34 CEST 2006 (bug fixes, see changelog)
SOURCE Sun Oct 15 14:09:54 CEST 2006 (sound driver from IST)
DOC SOURCE DEBIAN Mon Oct 23 14:14:16 CEST 2006 (web site moved to eris.liralab.it)
DOC SOURCE DEBIAN Tue Oct 24 11:47:36 CEST 2006 (make sure pipeline is working)
DOC SOURCE DEBIAN Wed Oct 25 11:55:52 CEST 2006 (clean up licensing)

0 comments on commit 24ad91f

Please sign in to comment.