1434667 - Move the thunderbird branding to mail/branding

Status: RESOLVED FIXED

(Thunderbird :: Build Config, enhancement)

Description

[Richard Marti (:Paenglab)]

It makes for me no sense to have the official branding in other-licenses instead of mail/branding. This separation can lead to forgetting to change the files there too.

Also other-licences should be for tools which have, like the name says, other licences.

FX has it's Firefox branding also in the branding directory.

Comment 1

[Richard Marti (:Paenglab)]

Attachment: branding.patch

Move it.

Comment 2

[Richard Marti (:Paenglab)]

Comment on attachment 8947170 [details] [diff] [review]
branding.patch

Review of attachment 8947170 [details] [diff] [review]:
-----------------------------------------------------------------

::: mail/locales/l10n.toml
@@ +86,5 @@
>      l10n = "{l}editor/ui/**"
>  
>  [[paths]]
> +    reference = "mail/branding/thunderbird/locales/en-US/**"
> +    l10n = "{l}mail/branding/thunderbird/**"

I'm not sure if this is still needed. Daily has also no special path added.

What do you think?

Comment 3

[Tom Prince [:tomprince]]

Bug 561032 is where firefox moved their branding and Bug 541761 is where they changed the license.

Looking other-licenses/branding/thunderbird/LICENSE it doesn't appear that the Thunderbird branding is currently permissively licensed. I suspect that Mozilla Foundation own the rights to these files, so we probably need to get approval to change the license (and thus to move it out of other-licenses).

Comment 4

[Tom Prince [:tomprince]]

https://bugzilla.mozilla.org/show_bug.cgi?id=541761#c35 in particular is relevant.

Comment 5

[Axel Hecht [:Pike]]

Comment on attachment 8947170 [details] [diff] [review]
branding.patch

Review of attachment 8947170 [details] [diff] [review]:
-----------------------------------------------------------------

Please leave both the old and the new branding paths in. In the l10n*.ini and l10n.toml. You're also missing l10n.ini in the list of changed files.

Also, l10n.toml needs to keep the paths we're still using on other branches for x-channel.

I suspect that I'm the real reviewer for this patch, too.

Comment 6

[Richard Marti (:Paenglab)]

(In reply to Axel Hecht [:Pike] from comment #5)
> Comment on attachment 8947170 [details] [diff] [review]
> branding.patch
> 
> Review of attachment 8947170 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> Please leave both the old and the new branding paths in. In the l10n*.ini
> and l10n.toml. You're also missing l10n.ini in the list of changed files.
> 
> Also, l10n.toml needs to keep the paths we're still using on other branches
> for x-channel.

So you mean leave the old path in l10n.ini, l10n.toml, l10n-beta.ini and l10n-central.ini and add the new path in l10n.toml?

Comment 7

[Axel Hecht [:Pike]]

Also to the ini files, they're still used by the dashboard.

The reason why we keep the old paths around is that that way, we'll have tools notify localizers that they should remove those files.

And then just the toml file needs to implement the rules for all of cross channel.

Comment 8

[Richard Marti (:Paenglab)]

Comment on attachment 8947170 [details] [diff] [review]
branding.patch

Removing the r? until it's clear what to do with the LICENCE file.

Comment 9

[Richard Marti (:Paenglab)]

Attachment: branding.patch

Is it this what you want?

Comment 10

[Axel Hecht [:Pike]]

Comment on attachment 8947199 [details] [diff] [review]
branding.patch

Please stick to my work account.

Comment 11

[Gervase Markham [:gerv]]

I think the TB Council should have the final say on branding licensing, but we moved Firefox to open source licensing for the branding so there was no question that Firefox was open source, and that argument applies to Thunderbird as well.

So I would support moving the files, and removing the old LICENSE file.

Gerv

Comment 12

[Richard Marti (:Paenglab)]

Attachment: branding.patch

I copied the LICENCE from FX. I think, the same licence applies to TB too as the TB copyright is still by Mozilla. Okay Gerv?

Comment 13

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

(In reply to Gervase Markham [:gerv] from comment #11)
> I think the TB Council should have the final say on branding licensing, but
> we moved Firefox to open source licensing for the branding so there was no
> question that Firefox was open source, and that argument applies to
> Thunderbird as well.

On behalf of the council, we are fine with making this change. Thanks all for working on this!

Comment 14

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Comment on attachment 8947564 [details] [diff] [review]
branding.patch

Stealing the build config review, these look fine to me. Looking forward to Pike's review for the l10n bits.

Comment 15

[Gervase Markham [:gerv]]

Comment on attachment 8947564 [details] [diff] [review]
branding.patch

r=gerv. I note that the directory structure chosen doesn't seem quite the same as the browser/branding structure, but maybe there's a good reason. Just flagging. r+ for the licensing content.

Gerv

Comment 16

[Axel Hecht [:Pike]]

Comment on attachment 8947564 [details] [diff] [review]
branding.patch

Review of attachment 8947564 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks, yes, this should work.

Comment 17

[Richard Marti (:Paenglab)]

Thanks to all!

Comment 18

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/1ea8335be979
Move the thunderbird branding to mail/branding. r=Pike,tomprince