[clfft] 20/109: Cleanup of txt not in the spirit of the clMath Apache license

[Jérôme Kieffer]

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

kieffer-guest pushed a commit to branch debian
in repository clfft.

commit 137cf48c699aae10c3e4e65feb8769b0b2da3f1d
Author: Kent Knox <kent.knox at amd>
Date:   Thu Sep 12 17:29:50 2013 -0500

    Cleanup of txt not in the spirit of the clMath Apache license
---
 CHANGELOG                         | 31 -------------------------------
 src/client/CMakeLists.pack        | 18 +++++++++++++++---
 src/library/generator.transpose.h |  4 ----
 src/library/repo.cpp              | 20 ++++++++++++++++++--
 4 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a88cad8..e5814ef 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -171,34 +171,3 @@ For example:
   ./clfft.Sample -iv
       - Watch for the version strings to print out; watch for 
         'Client Test *****PASS*****' to print out.
-_______________________________________________________________________________
-(C) 2010-2013 Advanced Micro Devices, Inc. All rights reserved. AMD, the AMD 
-Arrow logo, ATI, the ATI logo, Radeon, FireStream, FireGL, Catalyst, and 
-combinations thereof are trademarks of Advanced Micro Devices, Inc. Microsoft 
-(R), Windows, and Windows Vista (R) are registered trademarks of Microsoft 
-Corporation in the U.S. and/or other jurisdictions. OpenCL and the OpenCL logo 
-are trademarks of Apple Inc. used by permission by Khronos. Other names are for 
-informational purposes only and may be trademarks of their respective owners.
-
-The contents of this document are provided in connection with Advanced Micro 
-Devices, Inc. ("AMD") products. AMD makes no representations or warranties with 
-respect to the accuracy or completeness of the contents of this publication and 
-reserves the right to make changes to specifications and product descriptions 
-at any time without notice. The information contained herein may be of a 
-preliminary or advance nature and is subject to change without notice. No 
-license, whether express, implied, arising by estoppel or otherwise, to any 
-intellectual property rights is granted by this publication. Except as set forth
-in AMD's Standard Terms and Conditions of Sale, AMD assumes no liability 
-whatsoever, and disclaims any express or implied warranty, relating to its 
-products including, but not limited to, the implied warranty of 
-merchantability, fitness for a particular purpose, or infringement of any 
-intellectual property right.
-
-AMD's products are not designed, intended, authorized or warranted for use as 
-components in systems intended for surgical implant into the body, or in other 
-applications intended to support or sustain life, or in any other application 
-in which the failure of AMD's product could create a situation where personal 
-injury, death, or severe property or environmental damage may occur. AMD 
-reserves the right to discontinue or make changes to its products at any time 
-without notice.
-_______________________________________________________________________________
diff --git a/src/client/CMakeLists.pack b/src/client/CMakeLists.pack
index b590363..2fcf3ea 100644
--- a/src/client/CMakeLists.pack
+++ b/src/client/CMakeLists.pack
@@ -1,6 +1,18 @@
-#############################################################################
-##	Copyright (C) 2010,2011 Advanced Micro Devices, Inc. All Rights Reserved.
-#############################################################################
+# ########################################################################
+# Copyright 2013 Advanced Micro Devices, Inc.
+# 
+# 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.
+# ########################################################################
 cmake_minimum_required( VERSION 2.6 )
 project( clFFT.Sample )
 
diff --git a/src/library/generator.transpose.h b/src/library/generator.transpose.h
index b08e3d3..12ad701 100644
--- a/src/library/generator.transpose.h
+++ b/src/library/generator.transpose.h
@@ -14,10 +14,6 @@
  * limitations under the License.
  * ************************************************************************/
 
-////////////////////////////////////////////
-//	Copyright (C) 2011 Advanced Micro Devices, Inc. All Rights Reserved.
-////////////////////////////////////////////
-
 #pragma once
 #if !defined( AMD_CLFFT_generator_transpose_H )
 #define AMD_CLFFT_generator_transpose_H
diff --git a/src/library/repo.cpp b/src/library/repo.cpp
index 018dff5..b41d657 100644
--- a/src/library/repo.cpp
+++ b/src/library/repo.cpp
@@ -96,8 +96,24 @@ clfftStatus FFTRepo::setProgramCode( const clfftGenerators gen, const FFTKernelG
 
 	// Prefix copyright statement at the top of generated kernels
 	std::stringstream ss;
-	ss << std::endl << std::endl;
-	ss << "// Copyright (C) 2010-2013 Advanced Micro Devices, Inc. All Rights Reserved." << std::endl << std::endl;
+	ss << 
+		"/* ************************************************************************\n"
+		" * Copyright 2013 Advanced Micro Devices, Inc.\n"
+		" *\n"
+		" * Licensed under the Apache License, Version 2.0 (the \"License\");\n"
+		" * you may not use this file except in compliance with the License.\n"
+		" * You may obtain a copy of the License at\n"
+		" *\n"
+		" * http://www.apache.org/licenses/LICENSE-2.0\n"
+		" *\n"
+		" * Unless required by applicable law or agreed to in writing, software\n"
+		" * distributed under the License is distributed on an \"AS IS\" BASIS,\n"
+		" * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n"
+		" * See the License for the specific language governing permissions and\n"
+		" * limitations under the License.\n"
+		" * ************************************************************************/"
+	<< std::endl << std::endl;
+
 	std::string prefixCopyright = ss.str();
 
 	mapFFTs[ key ].ProgramString = prefixCopyright + kernel;

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