[SCM] faad2/master: Improve debian/copyright.
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Wed Aug 3 12:19:02 UTC 2011
The following commit has been merged in the master branch:
commit 3ec31d1ccd90b915b4f6ef0a590fef5cdd10109e
Author: Fabian Greffrath <fabian at greffrath.com>
Date: Wed Aug 3 13:54:45 2011 +0200
Improve debian/copyright.
diff --git a/debian/copyright b/debian/copyright
index 78e16be..198e4ed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,75 +1,104 @@
-This package was debianized by Aubin Paul on Sun, 8 Dec 2002 12:05:10 -0500.
-This package was prepared for inclusion in Debian by Matthew W. S. Bell
-<matthew at bells23.org.uk> in May 2006
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174&view=markup
+Upstream-Name: FAAD2
+Upstream-Contact: faac-dev at lists.sourceforge.net
+Source: http://www.audiocoding.com/faad2.html
-It was downloaded from http://faac.sourceforge.net/index.php.
-Official website is now at http://www.audiocoding.com/
-CVS is still hosted by SourceForge.net
+Files: *
+Copyright: 2002, M. Bakker
+ 2002-2005, M. Bakker, Ahead Software AG, http://www.nero.com
+ 2003-2005, M. Bakker, Nero AG, http://www.nero.com
+License: GPL-2+
+Comment:
+ ** Any non-GPL usage of this software or parts of this software is strictly
+ ** forbidden.
+ **
+ ** The "appropriate copyright message" mentioned in section 2c of the GPLv2
+ ** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
+ **
+ ** Commercial non-GPL licensing of this software is possible.
+ ** For more info contact Nero AG through Mpeg4AAClicense at nero.com.
-Debian Authors: Matthew W. S. Bell <matthew at bells23.org.uk>
- Aubin Paul <aubin at outlyer.org>
-Copyright: 2006, 2007, 2008 Matthew W. S. Bell
- 200 Aubin Paul
+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
+ * This program is distributed under the GNU General Public License, version 2.
+ * A copy of this license is included with this source.
-Upstream Authors: menno <menno at audiocoding.com>
- Alexander Kurpiers <a.kurpiers at nt.tu-darmstadt.de>
- M. Bakker <mbakker at nero.com>
- Ahead Software AG
- Nero AG
-Copyright: 2002-2005 M. Bakker
- 2003-2005 Ahead Software AG
- 2003-2005 Nero AG
+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.
-Other Authors: John Edwards
- Bill May <wmay at cisco.com>
- Quinnware
- VideoLAN
-Copyright: 2002 John Edwards
- 2003 Bill May
- 1997-2002 Quinnware
- 2004 VideoLAN
+Files: plugins/mpeg4ip/aa_file.cpp
+ plugins/mpeg4ip/aa_file.h
+ plugins/mpeg4ip/faad2.cpp
+ plugins/mpeg4ip/faad2.h
+Copyright: 2003, Bill May <wmay at cisco.com>
+License: GPL-2+
-License Declaration:
+Files: common/faad/getopt.*
+Copyright: 1987-1993, Free Software Foundation, Inc
+License: GPL-2+
-The GPL may be found in the file /usr/share/common-licenses/GPL.
+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 upstream source has the follwing license declaration:
----
-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.
+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.
+ .
+ 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/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-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, write to the Free Software Foundation, Inc., 51 Franklin
-St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Any non-GPL usage of this software or parts of this software is strictly
-forbidden.
-
-The "appropriate copyright message" mentioned in section 2c of the GPLv2 must
-read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
----
-
-The aacDECdrop module has the following license declaration:
----
-This program is distributed under the GNU General Public License, version 2. A
-copy of this license is included with this source.
----
-
-Some files (extra components and plugins) and the Debian packaging have the
-following license declaration:
----
-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.
----
+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
+ 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/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
--
faad2 packaging
More information about the pkg-multimedia-commits
mailing list