[ros-geometry-experimental] 01/01: Update copyright file

[Wookey]

This is an automated email from the git hooks/post-receive script.

wookey pushed a commit to branch master
in repository ros-geometry-experimental.

commit 142d6d630bcbae9e04b1a9aabfccbb390386aad0
Author: Wookey <wookey at wookware.org>
Date:   Thu Dec 24 03:34:29 2015 +0000

    Update copyright file
---
 debian/copyright | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 85 insertions(+), 6 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 3968c39..c7cbbe8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,33 @@ Upstream-Contact: >Esteve Fernandez <esteve at osrfoundation.org>
 Source: http://www.ros.org/wiki/actionlib
 
 Files: *
-Copyright: 2011-2015 Willow Garage, Inc.
+Copyright: 2008-2010 Willow Garage, Inc.
+License: BSD-3-clause
+
+Files: tf2/include/tf2/convert.h
+       tf2/include/tf2/impl/*
+Copyright: 2013, 2014, Open Source Robotics Foundation
+License: BSD-3-clause
+
+Files: test_tf2/test/test_utils.cpp
+       tf2/include/tf2/impl/utils.h
+       tf2/include/tf2/utils.h
+Copyright: 2014, Open Source Robotics Foundation, Inc
+License: Apache-2.0
+
+Files: tf2/include/tf2/LinearMath/*
+Copyright: 2003-2006, Gino van den Bergen / Erwin Coumans http:continuousphysics.com/Bullet
+           2003-2009, Erwin Coumans http:bullet.googlecode.com
+License: Zlib
+
+Files: tf2_eigen/*
+Copyright: Koji Terada
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2015, Thomas Moulard <thomas.moulard at gmail.com>,
+                 Jochen Sprickerhof <debian at jochen.sprickerhof.de>,
+           	 Leopold Palomo-Avellaneda <leo at alaxarxa.net>
 License: BSD-3-clause
 
 License: BSD-3-clause
@@ -35,9 +61,62 @@ License: BSD-3-clause
  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
-Files: debian/*
-Copyright: 2015, Thomas Moulard <thomas.moulard at gmail.com>,
-                 Jochen Sprickerhof <debian at jochen.sprickerhof.de>,
-           	 Leopold Palomo-Avellaneda <leo at alaxarxa.net>
-License: BSD-3-clause
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  * Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
  
+License: Zlib
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any
+ damages arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute
+ it freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product documentation
+ would be appreciated but is not re quired.
+ .
+ 2. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
+ .
+ 3. This notice may not be removed or altered from any source distribution.
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+     http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ A copy of the license should be found on this system in
+ /usr/share/common-licenses/Apache-2.0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-geometry-experimental.git