[ros-opencv-apps] 01/01: Fixed some issued in copyright
Leopold Palomo-Avellaneda
leo at alaxarxa.net
Mon Jan 9 10:44:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
lepalom-guest pushed a commit to branch master
in repository ros-opencv-apps.
commit a8cf11d65875456a8e62be6152fce5b7c27a43f1
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date: Mon Jan 9 11:41:21 2017 +0100
Fixed some issued in copyright
---
debian/copyright | 41 ++++++++++++++++++++++++-----------------
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 49fc49b..7797724 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,54 +9,58 @@ License: BSD-3-Clause
Files: debian/*
Copyright: 2016, Jochen Sprickerhof <jspricke at debian.org>,
Leopold Palomo-Avellaneda <leo at alaxarxa.net>
-License: BSD-3-Clause
+License: BSD-3-Clause
Files: include/opencv_apps/nodelet.h
src/nodelet/contour_moments_nodelet.cpp
src/nodelet/convex_hull_nodelet.cpp
src/nodelet/edge_detection_nodelet.cpp
src/nodelet/face_detection_nodelet.cpp
- src/nodelet/find_contours_nodelet.cpp
+ src/nodelet/find_contours_nodelet.cpp
src/nodelet/general_contours_nodelet.cpp
src/nodelet/goodfeature_track_nodelet.cpp
src/nodelet/hough_circles_nodelet.cpp
- src/nodelet/hough_lines_nodelet.cpp
+ src/nodelet/hough_lines_nodelet.cpp
src/nodelet/lk_flow_nodelet.cpp
src/nodelet/phase_corr_nodelet.cpp
src/nodelet/segment_objects_nodelet.cpp
src/nodelet/simple_compressed_example_nodelet.cpp
src/nodelet/simple_example_nodelet.cpp
- src/nodelet/simple_flow_nodelet.cpp
+ src/nodelet/simple_flow_nodelet.cpp
Copyright: 2014 Kei Okada.
2015 Tal Regev.
2016 Ryohei Ueda.
-License: BSD-3-Clause
+License: BSD-3-Clause
Files: src/nodelet/adding_images_nodelet.cpp
src/nodelet/smoothing_nodelet.cpp
src/nodelet/threshold_nodelet.cpp
Copyright: 2016 JSK Lab
JSK, 2016 Lab
-License: BSD-3-Clause
+License: BSD-3-Clause
Files: src/nodelet/nodelet.cpp
Copyright: 2016 Ryohei Ueda.
-License: BSD-3-Clause
+License: BSD-3-Clause
-License: BSD-3-Clause
+Files: src/node/standalone_nodelet_exec.cpp.in
+Copyright: 2016 Kentaro Wada.
+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
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 Willow Garage/JSK Lab, Inc. nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
+ * 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 JSK Lab (or 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
@@ -70,3 +74,6 @@ License: BSD-3-Clause
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.
+ .
+ On Debian systems, the complete text of the BSD 3-clause "New" or "Revised"
+ License can be found in `/usr/share/common-licenses/BSD'.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-opencv-apps.git
More information about the debian-science-commits
mailing list