[SCM] x264/master: Update copyright file

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 646d59c2a9e5315fe2e4078f32d5f6a7a9ab0316
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Wed Jul 15 23:03:38 2015 +0200

    Update copyright file

diff --git a/debian/copyright b/debian/copyright
index e6ef755..b75fc31 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,20 +5,8 @@ Source: http://www.videolan.org/developers/x264.html
 
 Files: *
 Copyright: 2003-2015 x264 project
-License: GPL-2+ or other
- 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
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
+License: GPL-2+
+Comment:
  This program is also available under a commercial proprietary license.
  For more information, contact us at licensing at x264.com.
 
@@ -138,7 +126,7 @@ License: public-domain
 
 Files: extras/cl*.h
 Copyright: (c) 2008-2012 The Khronos Group Inc
-License: other
+License: Expat
  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
@@ -158,7 +146,6 @@ License: other
  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