[SCM] gpac/master: Fix few lintian warnings concerning debian/copyright.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 68d99414dcbf0ddab936f80c9b18c9bd357a5756
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Jul 8 14:56:53 2015 +0100

    Fix few lintian warnings concerning debian/copyright.
    
    - dep5-copyright-license-name-not-unique
    - wildcard-matches-nothing-in-dep5-copyright

diff --git a/debian/copyright b/debian/copyright
index ca334c2..e63cf81 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -129,21 +129,6 @@ Files: src/utils/gzio.cpp
 Copyright: © 1995-2005, Jean-loup Gailly
            © 1995-2005, Mark Adler
 License: Zlib
- This software is provided 'as-is', without any express or implied
- warranty.  In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
 
 Files: include/gpac/internal/reedsolomon.h
        src/media_tools/reedsolomon.c
@@ -181,7 +166,7 @@ Comment:
 
 Files: modules/opencv_is/haarcascade_frontalface_default.xml
 Copyright: © 2000, Intel Corporation
-License: BSD-3-clause
+License: BSD-3-clause-intel
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
@@ -210,21 +195,6 @@ License: BSD-3-clause
 Files: modules/widgetman/unzip.*
 Copyright: © 1998-2005, Gilles Vollant
 License: Zlib
- This software is provided 'as-is', without any express or implied
- warranty.  In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not
-    claim that you wrote the original software. If you use this software
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
 
 Files: src/media_tools/mpeg2_ps.*
 Copyright: © 2004, Cisco Systems Inc.
@@ -248,7 +218,7 @@ Files: src/mcrypt/g_crypt.c
 Copyright: © 2000-2005, Jean Le Feuvre
 License: LGPL-2+
 
-Files: src/mcrpyt/rijndael-*
+Files: src/mcrypt/rijndael-*
 Copyright: © 1999, Mike Scott
 License: other-3
  Permission for free direct or derivative use is granted subject
@@ -1334,3 +1304,20 @@ License: other-nonfree-1
  using the code for non MPEG-U Widgets (ISO/IEC 23007-1) conforming products.
  .
  This copyright notice must be included in all copies or derivative works.
+
+License: Zlib
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.

-- 
gpac packaging