diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | COPYING | 8 | ||||
| -rw-r--r-- | debian/copyright | 8 | ||||
| -rw-r--r-- | doc/framing.html | 35 | ||||
| -rw-r--r-- | doc/oggstream.html | 35 | ||||
| -rw-r--r-- | libogg.spec | 2 |
6 files changed, 46 insertions, 44 deletions
@@ -1,3 +1,3 @@ Monty <monty@xiph.org> -and the rest of the Xiphophorus Company. +and the rest of the Xiph.org Foundation. @@ -1,4 +1,4 @@ -Copyright (c) 2001, Xiphophorus +Copyright (c) 2002, Xiph.org Foundation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -11,9 +11,9 @@ notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -- Neither the name of the Xiphophorus nor the names of its contributors -may be used to endorse or promote products derived from this software -without specific prior written permission. +- Neither the name of the Xiph.org Foundation nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/debian/copyright b/debian/copyright index 9e4e1e1..84e36c0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ Upstream Author(s): Monty <monty@xiph.org> Copyright: -Copyright (c) 2001, Xiphophorus +Copyright (c) 2002, Xiph.org Foundation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -20,9 +20,9 @@ notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -- Neither the name of the Xiphophorus nor the names of its contributors -may be used to endorse or promote products derived from this software -without specific prior written permission. +- Neither the name of the Xiph.org Foundation nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/doc/framing.html b/doc/framing.html index 64e8953..50bba5e 100644 --- a/doc/framing.html +++ b/doc/framing.html @@ -360,27 +360,28 @@ stereo encodings.<p> </a> <font size=-2 color=#505050> -Ogg is a <a href="http://www.xiph.org">Xiphophorus</a> effort to -protect essential tenets of Internet multimedia from corporate +Ogg is a <a href="http://www.xiph.org">Xiph.org Foundation</a> effort +to protect essential tenets of Internet multimedia from corporate hostage-taking; Open Source is the net's greatest tool to keep everyone honest. See <a href="http://www.xiph.org/about.html">About -Xiphophorus</a> for details. +the Xiph.org Foundation</a> for details. <p> -Ogg Vorbis is the first Ogg audio CODEC. Anyone may -freely use and distribute the Ogg and Vorbis specification, -whether in a private, public or corporate capacity. However, -Xiphophorus and the Ogg project (xiph.org) reserve the right to set -the Ogg/Vorbis specification and certify specification compliance.<p> - -Xiphophorus's Vorbis software CODEC implementation is distributed -under the Lessr/Library GNU Public License. This does not restrict -third parties from distributing independent implementations of Vorbis -software under other licenses.<p> - -OggSquish, Vorbis, Xiphophorus and their logos are trademarks (tm) of -<a href="http://www.xiph.org/">Xiphophorus</a>. These pages are -copyright (C) 1994-2001 Xiphophorus. All rights reserved.<p> +Ogg Vorbis is the first Ogg audio CODEC. Anyone may freely use and +distribute the Ogg and Vorbis specification, whether in a private, +public or corporate capacity. However, the Xiph.org Foundation and +the Ogg project (xiph.org) reserve the right to set the Ogg Vorbis +specification and certify specification compliance.<p> + +Xiph.org's Vorbis software CODEC implementation is distributed under a +BSD-like license. This does not restrict third parties from +distributing independent implementations of Vorbis software under +other licenses.<p> + +Ogg, Vorbis, Xiph.org Foundation and their logos are trademarks (tm) +of the <a href="http://www.xiph.org/">Xiph.org Foundation</a>. These +pages are copyright (C) 1994-2002 Xiph.org Foundation. All rights +reserved.<p> </body> diff --git a/doc/oggstream.html b/doc/oggstream.html index 46a221c..56a50d7 100644 --- a/doc/oggstream.html +++ b/doc/oggstream.html @@ -165,27 +165,28 @@ where decode requires more information). </a> <font size=-2 color=#505050> -Ogg is a <a href="http://www.xiph.org">Xiphophorus</a> effort to -protect essential tenets of Internet multimedia from corporate +Ogg is a <a href="http://www.xiph.org">Xiph.org Foundation</a> effort +to protect essential tenets of Internet multimedia from corporate hostage-taking; Open Source is the net's greatest tool to keep everyone honest. See <a href="http://www.xiph.org/about.html">About -Xiphophorus</a> for details. +the Xiph.org Foundation</a> for details. <p> -Ogg Vorbis is the first Ogg audio CODEC. Anyone may -freely use and distribute the Ogg and Vorbis specification, -whether in a private, public or corporate capacity. However, -Xiphophorus and the Ogg project (xiph.org) reserve the right to set -the Ogg/Vorbis specification and certify specification compliance.<p> - -Xiphophorus's Vorbis software CODEC implementation is distributed -under the Lesser/Library GNU Public License. This does not restrict -third parties from distributing independent implementations of Vorbis -software under other licenses.<p> - -OggSquish, Vorbis, Xiphophorus and their logos are trademarks (tm) of -<a href="http://www.xiph.org/">Xiphophorus</a>. These pages are -copyright (C) 1994-2000 Xiphophorus. All rights reserved.<p> +Ogg Vorbis is the first Ogg audio CODEC. Anyone may freely use and +distribute the Ogg and Vorbis specification, whether in a private, +public or corporate capacity. However, the Xiph.org Foundation and +the Ogg project (xiph.org) reserve the right to set the Ogg Vorbis +specification and certify specification compliance.<p> + +Xiph.org's Vorbis software CODEC implementation is distributed under a +BSD-like license. This does not restrict third parties from +distributing independent implementations of Vorbis software under +other licenses.<p> + +Ogg, Vorbis, Xiph.org Foundation and their logos are trademarks (tm) +of the <a href="http://www.xiph.org/">Xiph.org Foundation</a>. These +pages are copyright (C) 1994-2002 Xiph.org Foundation. All rights +reserved.<p> </body> diff --git a/libogg.spec b/libogg.spec index cae5a6b..5cf976a 100644 --- a/libogg.spec +++ b/libogg.spec @@ -9,7 +9,7 @@ Release: %{release} Group: Libraries/Multimedia Copyright: LGPL URL: http://www.xiph.org/ -Vendor: Xiphophorus <team@xiph.org> +Vendor: Xiph.org Foundation <team@xiph.org> Source: ftp://ftp.xiph.org/pub/ogg/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root Prefix: %{_prefix} |