[SCM] x264/master: Updated debian/copyright with new license information for new upstream snapshot.
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Mon Jul 25 23:18:36 UTC 2011
The following commit has been merged in the master branch:
commit 577fe55e5e2cea8f56087476423d177471344827
Author: Andres Mejia <mcitadel at gmail.com>
Date: Mon Jul 25 19:02:40 2011 -0400
Updated debian/copyright with new license information for new upstream snapshot.
diff --git a/debian/copyright b/debian/copyright
index ead2958..e1bf573 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,71 +1,178 @@
-This package was debianized by Sam Hocevar (Debian packages)
-<sam+deb at zoy.org> on Fri, 9 Mar 2007 22:59:37 +0100.
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174&view=markup
+Upstream-Name: x264
+Upstream-Contact: x264-devel at videolan.org
+Source: http://www.videolan.org/developers/x264.html
-It was downloaded from http://git.videolan.org/?p=x264.git;a=shortlog;h=refs/heads/stable
+Files: *
+Copyright: 2003-2011 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, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
+ .
+ This program is also available under a commercial proprietary license.
+ For more information, contact us at licensing at x264.com.
-encoder/eval.c, extras/getopt.c:
- Copyright (C) 2002 Michael Niedermayer <michaelni at gmx.at>
- Copyright (C) 1987-1996, 1998-2001 Free Software Foundation, Inc.
- Licensed unter the GNU LGPL, version 2.1 or later.
+Files: common/x86/x86inc.asm
+Copyright: 2005-2011 x264 project
+License: ISC
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-all other files:
- Copyright (c) 2003-2006 Laurent Aimar <fenrir at via.ecp.fr>
- Alex Izvorski (aizvorski(at)gmail.com)
- Alex Wright (alexw0885(at)hotmail.com)
- Andrew Dunstan
- bobololo
- Christian Heine (sennindemokrit(at)gmx.net)
- Eric Petit <titer at videolan.org>
- Francesco Corriga
- Justin Clay (justin_clay(at)hotmail.com)
- Loren Merritt (lorenm(at)u.washington.edu)
- Måns Rullgård (mru(at)mru.ath.cx)
- Michael Niedermayer (michaelni(at)gmx.at)
- Mike Matsnev (mike(at)po.cs.msu.su)
- Min Chen <chenm001 at 163.com>
- Phil Jensen (philj(at)csufresno.edu)
- Radek Czyz (radoslaw(at)syskin.cjb.net)
- Riccardo Stievano (walkunafraid(at)tin.it)
- Tuukka Toivonen (tuukkat(at)ee.oulu.fi)
- Vincent Torri (Vincent.Torri(at)iecn.u-nancy.fr)
- Copyright (C) 1989-1994, 1996-1999, 2001 Free Software Foundation, Inc.
- Licensed under the GNU General Public License, version 2 or later.
+Files: debian/*
+Copyright: 2008-2011 Reinhard Tartler <siretart at tauware.de>
+ 2008-2011 Fabian Greffrath <fabian+debian at greffrath.com>
+ 2008-2011 Andres Mejia <amejia at debian.org>
+License: GPL-2+
-The blurb for the GNU Lesser General Publice License, version 2.1 or later:
+Files: extras/avisynth_c.h
+Copyright: 2003 Kevin Atkinson
+License: GPL-2+ with other exception
+ 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, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA, or visit
+ http://www.gnu.org/copyleft/gpl.html .
+ .
+ As a special exception, I give you permission to link to the
+ Avisynth C interface with independent modules that communicate with
+ the Avisynth C interface solely through the interfaces defined in
+ avisynth_c.h, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting combined work
+ under terms of your choice, provided that every copy of the
+ combined work is accompanied by a complete copy of the source code
+ of the Avisynth C interface and Avisynth itself (with the version
+ used to produce the combined work), being distributed under the
+ terms of the GNU General Public License plus this exception. An
+ independent module is a module which is not derived from or based
+ on Avisynth C Interface, such as 3rd-party filters, import and
+ export plugins, or graphical user interfaces.
- | This library is free software; you can redistribute it and/or
- | modify it under the terms of the GNU Lesser General Public
- | License as published by the Free Software Foundation; either
- | version 2.1 of the License, or (at your option) any later version.
- |
- | This library 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
- | Lesser General Public License for more details.
- |
- | You should have received a copy of the GNU Lesser General Public
- | License along with this library; if not, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+Files: extras/getopt.*
+Copyright: 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001
+ Free Software Foundation, Inc.
+License: LGPL-2.1+
+ This file is part of the GNU C Library.
+ .
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ The GNU C Library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02111-1307 USA.
-The blurb for the GNU General Publice License, version 2 or later:
+Files: extras/inttypes.h
+Copyright: 2006 Alexander Chemeris
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ 3. The name of the author may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- | 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, 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, write to the Free Software
- | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+Files: extras/gas-preprocessor.pl
+Copyright: David Conrad
+License: GPL-2+
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL'. and the
-complete text of the GNU Lesser General Public License can be found in
-the `/usr/share/common-licenses/LGPL' file.
+Files: extras/stdint.h
+Copyright: none
+License: public-domain
+ THIS SOFTWARE IS NOT COPYRIGHTED
+ .
+ This source code is offered for use in the public domain. You may
+ use, modify or distribute it freely.
+ .
+ This code is distributed in the hope that it will be useful but
+ WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ DISCLAIMED. This includes but is not limited to warranties of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+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, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General Public
+ License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU Lesser General Public
+ License can be found in `/usr/share/common-licenses/LGPL-2.1'.
--
x264 packaging
More information about the pkg-multimedia-commits
mailing list