[dolphin-emu] 12/33: Remove bundled opencl headers and use debian package instead

[James Cowgill]

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

jcowgill-guest pushed a commit to branch master
in repository dolphin-emu.

commit dfb9b5502f45b9fe1f68a96e02dfe231a91b4011
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sun Oct 26 19:54:12 2014 +0000

    Remove bundled opencl headers and use debian package instead
---
 debian/control   |  1 +
 debian/copyright | 25 +------------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/debian/control b/debian/control
index 3beebd2..2abdcb0 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,7 @@ Build-Depends: debhelper (>= 9),
 		libxrandr-dev,
 		libusb-1.0-0-dev,
 		lsb-release,
+		opencl-headers,
 		pkg-config,
 		portaudio19-dev,
 		zlib1g-dev
diff --git a/debian/copyright b/debian/copyright
index faceaf6..7f1f78a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,6 +5,7 @@ Upstream-Contact: http://forums.dolphin-emu.org/
                   http://code.google.com/p/dolphin-emu/people/list
 Files-Excluded:
  Externals/Bochs_disasm/PowerPCDisasm.*
+ Externals/CLRun/include/CL
  Externals/GLES3
  Externals/GLew
  Externals/LZO
@@ -291,30 +292,6 @@ Copyright:
  2007-2008, Segher Boessenkool <segher at kernel.crashing.org>
 License: GPL-2
 
-Files:
- Externals/CLRun/include/CL/*
-Copyright:
- 2008-2012, The Khronos Group Inc
-License:
- 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.
-
 Files: Externals/Bochs_disasm/*
 Copyright: Bochs Emulator Project, http://bochs.sourceforge.net/
 License: LGPL-2.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/dolphin-emu.git