322000 - Update about:license to have all the required notices

Status: RESOLVED FIXED

(mozilla.org :: Licensing, task)

Description

[Gervase Markham [:gerv]]

We need to make sure Firefox's about:licence contains all the required information.

For example, some of our code is under BSD-like licences which require notification sentences.

Gerv

Comment 1

[Gervase Markham [:gerv]]

Attachment: Patch v.1

This patch creates a new "license.html" file which has all the licensing information in, and retires "MPL-1.1.html" and "NPL-1.1.html". It updates various points in the code to build and reference the new file, and updates the Firefox and Thunderbird about boxes to use it.

Gerv

Comment 2

[Gervase Markham [:gerv]]

The new text has had r=cbeard by email. The only thing now is to make sure it doesn't break Firefox's or Thunderbird's About dialog.

Gerv

Comment 3

[Gervase Markham [:gerv]]

Attachment: Patch v.2

OK, I've checked the patch doesn't break the Firefox About dialog (and the Thunderbird change is identical). This new version of the patch uses about:license rather than a chrome:// URL as the link, for neatness.

Gerv

Comment 4

[Gervase Markham [:gerv]]

CCing mscott and mconnor for review. (As the Product this bug is in doesn't have flags, I can't set flags to request it.)

mscott, mconnor: can you please rubber-stamp me checking this in? I ask because, unlike most licensing changes, this does actually involve a small code change.

Gerv

Comment 5

[Mike Connor [:mconnor]]

looks ok to me, not sure about using about:license in the string, but its ok for now.

Comment 6

[Scott MacGregor]

looks ok to me too.

Comment 7

[Stefan Sitter [:ssitter]]

Hello,

the check in busted the Linux galactica Dep Lt-Release and MacOSX Darwin 7.9.0 hilo Dep Lt-Release builds at http://tinderbox.mozilla.org/showbuilds.cgi?tree=Sunbird

error: file '/builds/tinderbox/Lt-Trunk/Linux_2.4.21-32.0.1.ELsmp_Depend/mozilla/xpfe/global/resources/content/license.html' doesn't exist at /builds/tinderbox/Lt-Trunk/Linux_2.4.21-32.0.1.ELsmp_Depend/mozilla/config/make-jars.pl line 443, <STDIN> line 74.

Comment 8

[:Gavin Sharp [email: [e-mail]]]

I've commented out the change to xpfe/global/jar.mn to fix the SeaMonkey/Thunderbird build bustage. Looks like license.html wasn't added in xpfe/global/resources/content, and the MPL/NPL files weren't removed.

Comment 9

[:Gavin Sharp [email: [e-mail]]]

I've copied the the license.html that was checked in and deleted the files in xpfe, to mirror toolkit:

mozilla/xpfe/global/jar.mn;                         1.88;
mozilla/xpfe/global/resources/content/MPL-1.1.html; delete;
mozilla/xpfe/global/resources/content/NPL-1.1.html; delete;
mozilla/xpfe/global/resources/content/license.html; 1.1;

Gerv, could you please review the changes I've committed to ensure they are correct?

Comment 10

[Gervase Markham [:gerv]]

*&$%*. 

Thankyou, gentlemen, for cleaning up after me. I should have thought harder about this and realised there were two copies of everything.

Gavin, that sounds fine. If it's building, that's enough. I'll download and confirm with nightlies tomorrow.

I'll get this right when I check into the branch.

Gerv

Comment 11

[Gervase Markham [:gerv]]

Belated trunk checkin details:

Removing toolkit/content/MPL-1.1.html;
/cvsroot/mozilla/toolkit/content/MPL-1.1.html,v  <--  MPL-1.1.html
new revision: delete; previous revision: 1.3
done
Checking in toolkit/content/jar.mn;
/cvsroot/mozilla/toolkit/content/jar.mn,v  <--  jar.mn
new revision: 1.19; previous revision: 1.18
done
Removing toolkit/content/NPL-1.1.html;
/cvsroot/mozilla/toolkit/content/NPL-1.1.html,v  <--  NPL-1.1.html
new revision: delete; previous revision: 1.2
done
RCS file: /cvsroot/mozilla/toolkit/content/license.html,v
done
Checking in toolkit/content/license.html;
/cvsroot/mozilla/toolkit/content/license.html,v  <--  license.html
initial revision: 1.1
done
Checking in xpfe/global/jar.mn;
/cvsroot/mozilla/xpfe/global/jar.mn,v  <--  jar.mn
new revision: 1.86; previous revision: 1.85
done
Checking in netwerk/protocol/about/src/nsAboutRedirector.cpp;
/cvsroot/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp,v  <--  nsAboutRedirector.cpp
new revision: 1.25; previous revision: 1.24
done
Checking in mail/config/mail-jar.mn;
/cvsroot/mozilla/mail/config/mail-jar.mn,v  <--  mail-jar.mn
new revision: 1.49; previous revision: 1.48
done
Checking in mail/base/content/credits.xhtml;
/cvsroot/mozilla/mail/base/content/credits.xhtml,v  <--  credits.xhtml
new revision: 1.10; previous revision: 1.9
done
Checking in browser/base/content/credits.xhtml;
/cvsroot/mozilla/browser/base/content/credits.xhtml,v  <--  credits.xhtml
new revision: 1.15; previous revision: 1.14
done
Checking in toolkit/locales/en-US/chrome/global/license.dtd;
/cvsroot/mozilla/toolkit/locales/en-US/chrome/global/license.dtd,v  <--  license.dtd
new revision: 1.3; previous revision: 1.2
done

Gerv

Comment 12

[Gervase Markham [:gerv]]

And the branch:

Removing toolkit/content/MPL-1.1.html;
/cvsroot/mozilla/toolkit/content/Attic/MPL-1.1.html,v  <--  MPL-1.1.html
new revision: delete; previous revision: 1.3
done
Checking in toolkit/content/jar.mn;
/cvsroot/mozilla/toolkit/content/jar.mn,v  <--  jar.mn
new revision: 1.17.2.1; previous revision: 1.17
done
Removing toolkit/content/NPL-1.1.html;
/cvsroot/mozilla/toolkit/content/Attic/NPL-1.1.html,v  <--  NPL-1.1.html
new revision: delete; previous revision: 1.2
done
Checking in toolkit/content/license.html;
/cvsroot/mozilla/toolkit/content/license.html,v  <--  license.html
new revision: 1.1.2.2; previous revision: 1.1.2.1
done
Checking in xpfe/global/jar.mn;
/cvsroot/mozilla/xpfe/global/jar.mn,v  <--  jar.mn
new revision: 1.85.2.1; previous revision: 1.85
done
Checking in netwerk/protocol/about/src/nsAboutRedirector.cpp;
/cvsroot/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp,v  <--  nsAboutRedirector.cpp
new revision: 1.22.2.2; previous revision: 1.22.2.1
done
Checking in mail/config/mail-jar.mn;
/cvsroot/mozilla/mail/config/mail-jar.mn,v  <--  mail-jar.mn
new revision: 1.48.2.1; previous revision: 1.48
done
Checking in mail/base/content/credits.xhtml;
/cvsroot/mozilla/mail/base/content/credits.xhtml,v  <--  credits.xhtml
new revision: 1.4.2.4; previous revision: 1.4.2.3
done
Checking in browser/base/content/credits.xhtml;
/cvsroot/mozilla/browser/base/content/credits.xhtml,v  <--  credits.xhtml
new revision: 1.10.4.4; previous revision: 1.10.4.3
done
Checking in toolkit/locales/en-US/chrome/global/license.dtd;
/cvsroot/mozilla/toolkit/locales/en-US/chrome/global/license.dtd,v  <--  license.dtd
new revision: 1.2.18.1; previous revision: 1.2
done
Removing xpfe/global/resources/content/MPL-1.1.html;
/cvsroot/mozilla/xpfe/global/resources/content/Attic/MPL-1.1.html,v  <--  MPL-1.1.html
new revision: delete; previous revision: 1.3
done
Removing xpfe/global/resources/content/NPL-1.1.html;
/cvsroot/mozilla/xpfe/global/resources/content/Attic/NPL-1.1.html,v  <--  NPL-1.1.html
new revision: delete; previous revision: 1.1
done
Checking in xpfe/global/resources/content/license.html;
/cvsroot/mozilla/xpfe/global/resources/content/license.html,v  <--  license.htmlnew revision: 1.1.2.2; previous revision: 1.1.2.1
done

Gerv

Comment 13

[Reed Loden [:reed]]

s/about:licence/about:license/ in summary (not sure if it's wrong anywhere else)

Comment 14

[Steve Russell (RaiseMachine)]

(In reply to comment #3)
> Created an attachment (id=209351) [edit]
> Patch v.2

The line:

-<!ENTITY license.and       "and">

needs to be added back to this patch as it's causing an undefined entity error on the about: page.

Comment 15

[Steve Russell (RaiseMachine)]

My bad... Forgot to mention using latest tbox hourly trunk on Win.

Comment 16

[Steve Russell (RaiseMachine)]

(In reply to comment #15)
> My bad... Forgot to mention using latest tbox hourly trunk on Win.

...as well as to mention it's license.dtd the line is in. :P

Comment 17

[Gervase Markham [:gerv]]

Reed: "licence" is the correct spelling. It's just Americans who spell it incorrectly :-). You'll notice that Firefox and Mozilla accept both spellings.

Steve: thanks. <curses again> The entity was used on multiple pages and I didn't notice. Hopefully this should be the end of it:

Checking in toolkit/locales/en-US/chrome/global/license.dtd;
/cvsroot/mozilla/toolkit/locales/en-US/chrome/global/license.dtd,v  <--  license.dtd
new revision: 1.2.18.2; previous revision: 1.2.18.1
done

Checking in toolkit/locales/en-US/chrome/global/license.dtd;
/cvsroot/mozilla/toolkit/locales/en-US/chrome/global/license.dtd,v  <--  license.dtd
new revision: 1.4; previous revision: 1.3
done

Gerv