[SCM] faad2/master: Update debian/copyright for recently added or removed source files

[fabian at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b3e2db84276ace80f6ef58669652103e14330eb6
Author: Fabian Greffrath <fabian at debian.org>
Date:   Sat Sep 30 14:24:35 2017 +0200

    Update debian/copyright for recently added or removed source files

diff --git a/debian/copyright b/debian/copyright
index 4ee64f3..cfb7a1a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,21 +15,15 @@ Comment:
  ** The "appropriate copyright message" mentioned in section 2c of the GPLv2
  ** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
 
-Files: aacDECdrop/decode.h
- aacDECdrop/decthread.c
- aacDECdrop/decthread.h
- aacDECdrop/main.c
- aacDECdrop/misc.c
- aacDECdrop/misc.h
- aacDECdrop/wave_out.c
- aacDECdrop/wave_out.h
-Copyright: 2002, John Edwards
-License: GPL-2
-
 Files: frontend/getopt.*
 Copyright: 1987-1993, Free Software Foundation, Inc
 License: GPL-2+
 
+Files: frontend/mp4read.c
+ frontend/mp4read.h
+Copyright: 2017, Krzysztof Nikiel
+License: GPL-3+
+
 Files: plugins/mpeg4ip/aa_file.cpp
  plugins/mpeg4ip/aa_file.h
  plugins/mpeg4ip/faad2.cpp
@@ -37,81 +31,42 @@ Files: plugins/mpeg4ip/aa_file.cpp
 Copyright: 2003, Bill May <wmay at cisco.com>
 License: GPL-2+
 
-Files: plugins/QCD/QCDInputDLL.h
- plugins/QCD/QCDModDefs.h
- plugins/QCD/QCDModInput.h
- plugins/QCDMp4/QCDInputDLL.h
- plugins/QCDMp4/QCDModDefs.h
- plugins/QCDMp4/QCDModInput.h
- plugins/QCDMp4/QCDModTagEditor.h
-Copyright: 1997-2002, Quinnware
-License: other
- //	This code is free.  If you redistribute it in any form, leave this notice
- //	here.
- //
- //	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.
-
-Files: plugins/QCDMp4/mbs.h
-Copyright: 2001-2002, Cisco Systems Inc.
-License: MPL-1.1
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is MPEG4IP.
- * 
- * The Initial Developer of the Original Code is Cisco Systems Inc.
- * Portions created by Cisco Systems Inc. are
- * Copyright (C) Cisco Systems Inc. 2001-2002.  All Rights Reserved.
- * 
- * Contributor(s): 
- *              Dave Mackie             dmackie at cisco.com
- .
- On Debian systems, the complete text of the Mozilla Public
- License Version 1.1 can be found in "/usr/share/common-licenses/MPL-1.1".
-
 Files: debian/*
 Copyright: 2002, Aubin Paul <aubin at outlyer.org>
  2006-2008, Matthew W. S. Bell <matthew at bells23.org.uk>
  2009-2017, Fabian Greffrath <fabian at debian.org>
 License: GPL-2+
 
-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, version 2.
+License: GPL-2+
+ This package 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,
+ This package 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/>.
+ along with this program. If not, see <https://www.gnu.org/licenses/>
  .
  On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-License: GPL-2+
- This program is free software; you can redistribute it and/or modify
+License: GPL-3+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
  .
- This program is distributed in the hope that it will be useful,
+ This package 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/>.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

-- 
faad2 packaging