Update to 2.0.0 tree from current Fremantle build

[opencv] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index a08cf67..813bd20 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,30 +31,31 @@ Upstream Authors: Abrosimov, Dmitry (Intel Corp.)
                   Sobolev, Andrey (Moscow State Uni)
                   Zaguskin, Victor (Intel Corp.)
 
-IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. 
+IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
 
-By downloading, copying, installing or using the software you agree to this
-license. If you do not agree to this license, do not download, install, copy
-or use the software.
+ By downloading, copying, installing or using the software you agree to this license.
+ If you do not agree to this license, do not download, install,
+ copy or use the software.
 
 
-                       Intel License Agreement 
-               For Open Source Computer Vision Library 
+                          License Agreement
+               For Open Source Computer Vision Library
 
-Copyright (C) 2000, 2001, Intel Corporation, all rights reserved.
-Third party copyrights are property of their respective owners. 
+Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+Copyright (C) 2008-2009, Willow Garage Inc., all rights reserved.
+Third party copyrights are property of their respective owners.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-  * Redistribution's of source code must retain the above copyright notice,
+  * Redistributions of source code must retain the above copyright notice,
     this list of conditions and the following disclaimer.
 
-  * Redistribution's in binary form must reproduce the above copyright notice,
+  * 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.
 
-  * The name of Intel Corporation may not be used to endorse or promote products
+  * The name of the copyright holders may not 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
@@ -66,5 +67,5 @@ indirect, incidental, special, exemplary, or consequential damages
 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.  
+the use of this software, even if advised of the possibility of such damage.