[ros-image-common] 01/02: Copyright review

[Wookey]

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

wookey pushed a commit to branch master
in repository ros-image-common.

commit ae1848136a11c5c3fa369825c29a038bb50c341b
Author: Wookey <wookey at wookware.org>
Date:   Sat Dec 26 00:29:01 2015 +0000

    Copyright review
---
 debian/copyright | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 58 insertions(+), 7 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index bcf48e2..ddd3b9e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,23 @@ Upstream-Name: image-common
 Source: http://www.ros.org/wiki/image_common
 
 Files: *
-Copyright: 2009-2015 Willow Garage, Inc.
+Copyright: 2009 Willow Garage, Inc.
 License: BSD-3-clause
 
+Files: camera_info_manager/*
+Copyright: 2010-2012, Jack O'Quin <jack.oquin at gmail.com>
+License: BSD-3-clause-generic
+
+Files: image_transport/tutorial/*
+Copyright: 2014 Vincent Rabaud <vincent.rabaud at gmail.com>
+License: Apache-2.0
+
+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
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -34,9 +48,46 @@ 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-3-clause-generic
+ 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.
+  * Neither the name of the author nor other contributors may be used
+    to endorse or promote products derived from this software without
+    specific prior written permission.
+ .
+ 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: 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
\ No newline at end of file

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