[SCM] x264/master: Document the license of extras/cl*.h (Closes: #739499)

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 99812562a7a57f634db006c086ea876133242053
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 23 10:13:16 2014 -0400

    Document the license of extras/cl*.h (Closes: #739499)

diff --git a/debian/copyright b/debian/copyright
index 9a809cd..8b54596 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -136,6 +136,29 @@ License: public-domain
  DISCLAIMED. This includes but is not limited to warranties of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+Files: extras/cl*.h
+Copyright: (c) 2008-2012 The Khronos Group Inc
+License: other
+ 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.
+
+
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

-- 
x264 packaging