[ros-vision-opencv] 06/07: Updated copyright

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to branch master
in repository ros-vision-opencv.

commit d8314f1f36d3e8447e6b503e56dcf26764531ad4
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date:   Sun Oct 23 19:40:08 2016 +0200

    Updated copyright
---
 debian/copyright | 41 +----------------------------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index e14fc83..39dc918 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,20 +12,9 @@ Files: cv_bridge/src/module.hpp
 Copyright: 2014, Open Source Robotics Foundation, Inc
 License: Apache-2.0
 
-Files: opencv_apps/*
-Copyright: 2014, Kei Okada
-License: BSD-3-clause-Okada
-
-Files: opencv_apps/src/node/simple_compressed_example.cpp
-       opencv_apps/src/node/simple_example.cpp
-       opencv_apps/src/nodelet/simple_compressed_example_nodelet.cpp
-       opencv_apps/src/nodelet/simple_example_nodelet.cpp
-Copyright: 2015, Tal Regev
-License: BSD-3-clause-Okada
-
 Files: debian/*
 Copyright: 2015, Thomas Moulard <thomas.moulard at gmail.com>,
-                 Jochen Sprickerhof <jspricke at debian.org>,
+           2016, Jochen Sprickerhof <jspricke at debian.org>,
                  Leopold Palomo-Avellaneda <leo at alaxarxa.net>
 License: BSD-3-clause
 
@@ -57,34 +46,6 @@ License: BSD-3-clause
  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-3-clause-Okada
- 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 Kei Okada nor the names of its
-    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.

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