From 85606acad739ce19746b828309050fd74acc9035 Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <no@email>
Date: Mon, 20 Jun 2011 21:10:25 +0000
Subject: [PATCH] removed opencv/tests subdirectory from installation; updated
 license; removed obsolete doc/README.txt

---
 CMakeLists.txt  |  7 +------
 doc/README.txt  | 54 -------------------------------------------------
 doc/license.txt |  2 +-
 3 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 doc/README.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fb55c094f..37d83a5422 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1361,7 +1361,7 @@ if(BUILD_PACKAGE)
         endif()
 
         install(DIRECTORY data samples DESTINATION "." COMPONENT main PATTERN ".svn" EXCLUDE)
-        install(DIRECTORY 3rdparty android modules tests doc DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE)
+        install(DIRECTORY 3rdparty android modules doc DESTINATION "." COMPONENT src PATTERN ".svn" EXCLUDE)
         #install(DIRECTORY doc DESTINATION doc COMPONENT src FILES_MATCHING PATTERN "*.rst" "*.tex")
         #install(DIRECTORY doc/pics DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
         #install(DIRECTORY doc/latex2sphinx DESTINATION doc COMPONENT src PATTERN ".svn" EXCLUDE)
@@ -1404,11 +1404,6 @@ if(BUILD_EXAMPLES OR INSTALL_PYTHON_EXAMPLES)
     add_subdirectory(samples)
 endif()
 
-#if(BUILD_TESTS)
-#    enable_testing()
-#    add_subdirectory(tests)
-#endif()
-
 add_subdirectory(3rdparty)
 
 
diff --git a/doc/README.txt b/doc/README.txt
deleted file mode 100644
index a7f1df983a..0000000000
--- a/doc/README.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-This file describes how to create the opencv.pdf manual in the
-.../opencv/doc directory. It further describes how to produce
-the html files on disk that populate the online OpenCV documenation
-wiki.
-
--------------------------------------------------------------------------
-In Ubuntu or Debian, required to build the opencv.pdf manual:
-
-  sudo apt-get install     texlive texlive-latex-extra latex-xcolor texlive-fonts-extra
- 
-To build the HTML documentation, these are also required:
-
-  sudo apt-get install python-setuptools             ## See [1] below for another install method
-  sudo easy_install -U Sphinx                        ## This is NOT the speech recognition program. 
-  sudo apt-get install     dvipng
-  sudo easy_install plasTeX            
-
--------------------------------------------------------------------------
-In other Linux distros you will also need to install LiveTeX and,
-optionally, if you want to produce the hmtl files, the Sphinx tool (http://sphinx.pocoo.org/)
-
-In MacOSX you can use MacTex (https://www.tug.org/mactex/).
-
-In Windows you can use MiKTeX
-
---------------------------------------------------------------------------
-(1) To build the latex files to create the opencv.pdf manual, in the 
-.../opencv/doc directory, issue the command:
-
-sh go
-
-(2) If you want to build the html files that OpenCV uses to populate the 
-online documentation, assuming you downloaded easy_install, 
-Sphinx and plasTex as above, then from the .../opencv/doc/latex2sphinx directory, 
-issue the "buildall" commend there:
-
-sh buildall
-
-The resulting html files will be be created in:  
-.../opencv/doc/latex2sphinx/_build/html
-
-Under this html directory, you will find index.html files for:
-  cpp   The C++ manual
-  c     The C manual
-  py    The Python manual
-
---------------------------------------------------------------------------
-[1] To install easy install on Ubuntu, try either (as stated above):
- sudo apt-get install python-setuptools
- or try using:
-First:
-  wget -q http://peak.telecommunity.com/dist/ez_setup.py
-Then
-  sudo python ez_setup.py
diff --git a/doc/license.txt b/doc/license.txt
index 18d389655a..b1a443a744 100644
--- a/doc/license.txt
+++ b/doc/license.txt
@@ -9,7 +9,7 @@ IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
                For Open Source Computer Vision Library
 
 Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-Copyright (C) 2008-2010, Willow Garage Inc., all rights reserved.
+Copyright (C) 2008-2011, 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,