Closed Bug 450358 Opened 14 years ago Closed 14 years ago

Xiph and CSIRO licenses should appear in about:license for media/* code

Categories

(Core :: General, defect)

defect
Not set
normal

Tracking

()

VERIFIED FIXED
mozilla1.9.1b1

People

(Reporter: u278084, Assigned: cajbir)

References

()

Details

(Keywords: verified1.9.1)

Attachments

(1 file, 1 obsolete file)

Various ogg libs are distributed under the BSD license. I think this should be reflected in the about:license page.
Flags: blocking1.9.1?
Summary: ogg license should appear in about:license → Xiph and Annodex licenses should appear in about:license for media/* code
Add Xiph and CSIRO (Annodex code) license to about:license.
Assignee: nobody → chris.double
Status: NEW → ASSIGNED
Attachment #333697 - Flags: review?(reed)
Comment on attachment 333697 [details] [diff] [review]
Add Xiph and CSIRO (Annodex code) license to about:license.

>+    <h1><a name="csiro"></a>CSIRO Australia License</h1>
>+
>+    <p class="correctme">This license applies to certain files in the directories

Is it only certain files or all files? If it's all files, just drop the "certain".

>+      <span class="path">media/libfishsound/</span>,  
>+      <span class="path">media/liboggz/</span> and

Need a comma after </span> (The serial/Oxford/Harvard comma). However, one of my next comments might/should make this unnecessary, so read on. :)

>+      <span class="path">media/liboggplay/</span>.

Please keep the list alphabetized (liboggplay before liboggz).

>+    </p>

I liked how you used <ul> and <li> for the Xiph.org license, so, can you use that format again instead of listing them all on the same line, or was there a particular reason you did it this way? Using <ul><li>... makes it easier to add new directories in the future, too, and it doesn't crowd them all on one line making readability easier.

>+    <h1><a name="xiph"></a>Xiph.org Foundation License</h1>
>+
>+    <p class="correctme">This license applies to certain files in the following directories 
>+      with the specified copyright year ranges:</p>

Same question as above: Is it only certain files or all files? If it's all files, just drop the "certain".

>+    <ul>
>+      <li><span class="path">media/libogg/</span>, Copyright (c) 2002, Xiph.org Foundation</li>
>+      <li><span class="path">media/libtheora/</span>, Copyright (c) 2002-2007, Xiph.org Foundation</li>
>+      <li><span class="path">media/libvorbis/</span>, Copyright (c) 2002-2004, Xiph.org Foundation</li>
>+    </ul>

Since the copyright holder is always Xiph.org Foundation, you could take that out, as you list it below, or do you think there will be a case where the copyright holder might be different but the code still under the Xiph.org license?

>+
>+<pre>
>+Copyright (c) &lt;year>, Xiph.org Foundation

Make that '>' "&gt;", please.

xpfe/global/resources/content/license.html and mail/license.html should be updated at the same time, too. This probably means you need another patch against comm-central (unless you can include a cross-repo patch somehow).
Attachment #333697 - Flags: review?(reed) → review-
Summary: Xiph and Annodex licenses should appear in about:license for media/* code → Xiph and CSIRO licenses should appear in about:license for media/* code
Attachment #333697 - Attachment is obsolete: true
Attachment #334615 - Flags: review?(reed)
Comment on attachment 334615 [details] [diff] [review]
Updated based on review comments

The first <ul> in each file is missing its </ul>. Other than than, r=gerv.

Gerv
Attachment #334615 - Flags: review?(reed) → review+
Keywords: checkin-needed
Keywords: checkin-needed
http://hg.mozilla.org/mozilla-central/rev/8b4971743a19
Keywords: checkin-needed
Target Milestone: --- → mozilla1.9.1b1
Version: unspecified → Trunk
http://hg.mozilla.org/mozilla-central/rev/3331da81af4d for review nit.

Still needs to land on comm-central.
Comment on attachment 334615 [details] [diff] [review]
Updated based on review comments

Patch doesn't apply.
Attachment #334615 - Attachment is obsolete: true
Flags: in-testsuite-
Keywords: checkin-needed
Target Milestone: mozilla1.9.1b1 → mozilla1.9.1b2
Flags: blocking1.9.1? → blocking1.9.1+
Target Milestone: mozilla1.9.1b2 → mozilla1.9.1
Attachment #334615 - Attachment is obsolete: false
"doesn't apply" in the "there's no /xpfe/global/resources/content/license.html in comm-central, just the One True license.html in toolkit/, thank Sauron" sense, so this has actually been done for a couple of months.
Status: ASSIGNED → RESOLVED
Closed: 14 years ago
Resolution: --- → FIXED
Retargeting to back when it actually landed, to get it out of beltzner's "blockers that still need to land on 1.9.1" list.
Target Milestone: mozilla1.9.1 → mozilla1.9.1b1
Hey Phil, to get it out of that list, add the "fixed1.9.1" keyword :)
Keywords: fixed1.9.1
Seeing as there hasn't been any discussions about this bug for 3 months and it's a sort-of doc bug, I'm assuming there aren't any residual issues. I'm moving this to verified as a result. If anyone has any qualms, feel free to bring them up.
Status: RESOLVED → VERIFIED
You need to log in before you can comment on or make changes to this bug.