Bug 450358 - "Xiph and CSIRO licenses should appear in about:license for media/* code" [r=gerv]
authorChris Double <chris.double@double.co.nz>
Wed, 01 Oct 2008 01:25:12 -0500
changeset 20050 8b4971743a198f55aafc64e01d88a7fb5109369b
parent 20049 ea0473aa18608ecc03d4bd7ae195d3c269c8abc3
child 20051 3331da81af4d2b67512b961d0c43308f023cb58e
push id2603
push userreed@reedloden.com
push dateWed, 01 Oct 2008 06:25:43 +0000
treeherdermozilla-central@8b4971743a19 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerv
bugs450358
milestone1.9.1b1pre
Bug 450358 - "Xiph and CSIRO licenses should appear in about:license for media/* code" [r=gerv]
toolkit/content/license.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -160,30 +160,32 @@
        or more of the licenses listed here, depending on the exact product 
        and version you choose.)
     </p>
     
     <ul>
       <li><a href="about:license#apple-mozilla">Apple/Mozilla NPRuntime License</a></li>
       <li><a href="about:license#breakpad">Breakpad License</a></li>
       <li><a href="about:license#bspatch">bspatch License</a></li>
-      <li><a href="about:license#cairo">Cairo Component Licenses</a></li>      
+      <li><a href="about:license#cairo">Cairo Component Licenses</a></li>
+      <li><a href="about:license#csiro">CSIRO Australia License</a></li>
       <li><a href="about:license#hunspell-nl">Dutch Spellchecking Dictionary</a></li>
       <li><a href="about:license#expat">Expat License</a></li>
       <li><a href="about:license#growl">Growl License</a></li>
       <li><a href="about:license#jpnic">Japan Network Information Centre License</a></li>
       <li><a href="about:license#jep">Java Embedding Plugin License</a></li>
       <li><a href="about:license#jemalloc">jemalloc License</a></li>
       <li><a href="about:license#hunspell-lt">Lithuanian Spellchecking Dictionary</a></li>
       <li><a href="about:license#openvision">OpenVision License</a></li>
       <li><a href="about:license#xdg">Red Hat xdg_user_dir_lookup License</a></li>
       <li><a href="about:license#hunspell-ru">Russian Spellchecking Dictionary</a></li>
       <li><a href="about:license#sparkle">Sparkle License</a></li>
       <li><a href="about:license#ucal">University of California License</a></li>      
       <li><a href="about:license#hunspell-en-US">US English Spellchecking Dictionary</a></li>
+      <li><a href="about:license#xiph">Xiph.org Foundation License</a></li>
     </ul>
     
     <ul>      
       <li><a href="about:license#other-notices">Other Required Notices</a>
       <li><a href="about:license#optional-notices">Optional Notices</a>
     </ul>
     
     </div>
@@ -2051,16 +2053,60 @@ OF USE, DATA OR PROFITS, WHETHER IN AN A
 NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 </pre>
 
 
 
     <hr>
 
+    <h1><a name="csiro"></a>CSIRO Australia License</h1>
+
+    <p class="correctme">This license applies to files in the directories:
+      <ul>
+        <li><span class="path">media/libfishsound/</span></li>  
+        <li><span class="path">media/liboggplay/</span></li>  
+        <li><span class="path">media/liboggz/</span></li>
+    </p>
+
+<pre>
+Copyright (C) 2003 CSIRO Australia
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+   
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   
+- 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.
+   
+- Neither the name of the CSIRO 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
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+CONTRIBUTORS 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.
+</pre>
+
+
+
+    <hr>
+
     <h1><a name="hunspell-nl"></a>Dutch Spellchecking Dictionary</h1>
 
     <p class="correctme">This license applies to certain files in the directory
       <span class="path">l10n/nl/extensions/spellcheck/hunspell/</span>. (This
       code only ships in some localized versions of this product.)</p>
 
 <pre>
 Copyright (c) 2006, 2007 OpenTaal
@@ -2593,16 +2639,61 @@ SUBSTITUTE GOODS OR SERVICES; LOSS OF US
 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.
 </pre>
 
     <hr>
 
+    <h1><a name="xiph"></a>Xiph.org Foundation License</h1>
+
+    <p class="correctme">This license applies to files in the following directories 
+      with the specified copyright year ranges:</p>
+    <ul>
+      <li><span class="path">media/libogg/</span>, 2002</li>
+      <li><span class="path">media/libtheora/</span>, 2002-2007</li>
+      <li><span class="path">media/libvorbis/</span>, 2002-2004</li>
+    </ul>
+
+<pre>
+Copyright (c) &lt;year&gt;, Xiph.org Foundation
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- 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.
+
+- 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
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
+OR CONTRIBUTORS 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.
+</pre>
+
+
+
+    <hr>
+
     <h1><a name="other-notices"></a>Other Required Notices</h1>
 
     <ul>
       <li>This software is based in part on the work of the Independent 
           JPEG Group.</li>
       <li>Portions of the OS/2 version of this software are copyright
           &copy;1996-2002 <a href="http://www.freetype.org/">The FreeType Project</a>.
           All rights reserved.</li>