[oclgrind] 01/04: Revert "Remove copyright for Khronos opencl headers"
Andreas Beckmann
anbe at moszumanska.debian.org
Wed Dec 16 01:26:57 UTC 2015
This is an automated email from the git hooks/post-receive script.
anbe pushed a commit to branch master
in repository oclgrind.
commit c4c954eebb7317832697d6c983e62397ffab05e1
Author: Andreas Beckmann <anbe at debian.org>
Date: Wed Dec 16 00:56:17 2015 +0100
Revert "Remove copyright for Khronos opencl headers"
This reverts commit 4b48c894fc4138214d83d41670c52f2e72ff2dea.
these files are still part of the source package
---
debian/copyright | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/debian/copyright b/debian/copyright
index 75f94b4..75c31b8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,6 +7,10 @@ Files: *
Copyright: 2013-2015 James Price and Simon McIntosh-Smith, University of Bristol
License: BSD-3-Clause
+Files: src/CL/*
+Copyright: (c) 2008-2013 The Khronos Group Inc.
+License: other-MIT-style-KHRONOS
+
Files: debian/*
Copyright: 2015 James Price <j.price at bristol.ac.uk>
License: BSD-3-Clause
@@ -37,3 +41,23 @@ 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.
+
+License: other-MIT-style-KHRONOS
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and/or associated documentation files (the
+ "Materials"), to deal in the Materials without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Materials, and to
+ permit persons to whom the Materials are furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Materials.
+ .
+ THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/oclgrind.git
More information about the Pkg-opencl-commits
mailing list