[SCM] gpac/master: Original code of reedsolomon says GPL-3+

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8543b27ce6be045f55950b6eec5d10b91f6d2c1e
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Feb 4 13:27:59 2012 +0100

    Original code of reedsolomon says GPL-3+

diff --git a/debian/copyright b/debian/copyright
index bdb7a5f..5801b2c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -233,17 +233,18 @@ License: LGPL-2+
 Files: include/gpac/internal/reedsolomon.h
        src/media_tools/reedsolomon.c
 Copyright: © 1991-1996, Henry Minsky (hqm at ua.com), Universal Access Inc.
-License: GPL-1+ or other
+License: GPL-3+ or other
 Comment: Copyright information is not given in the source files, however, the
  website where this code can be found states that this code is licensed under
- the GPL, with the option of licensing the code under different terms.
+ the GPL-3+, with the option of licensing the code under different terms.
  .
  The website is http://rscode.sourceforge.net/
- The statement (as of July 30, 2011) states the following.
- .
- "The code is licensed under the GPL, however a commercial license is also
- available. A royalty-free license to modify and redistribute the code in binary
- or source form is available."
+ The statement (as of July 30, 2011) states the following:
+  "The code is licensed under the GPL, however a commercial license is also
+  available. A royalty-free license to modify and redistribute the code in binary
+  or source form is available."
+ For more information see the "rscode-1.3.tgz" release tarball available at:
+ http://sourceforge.net/projects/rscode/files/
 
 Files: modules/amr_dec/amr_nb/typedefs.h
 Copyright: © 1998-2009, PacketVideo
@@ -1271,23 +1272,6 @@ License: FreeType License
  .
  --- end of FTL.TXT ---
 
-License: GPL-1+
- 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 1 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.
-Comment:
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public
- License version 3 can be found in `/usr/share/common-licenses/GPL-1'.
-
 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

-- 
gpac packaging