443398 - Fix remaining parts of unofficial branding

Status: VERIFIED FIXED

(Thunderbird :: Build Config, defect)

Description

[Mark Banner (:standard8)]

I've spun this out of bug 397621. To get this all working correctly, we need to:

- Change the ProductName from "Thunderbird" to "Shredder" in mac's tinder-config.pl
- Change the MOZ_APP_DISPLAYNAME in mail/branding/nightly/configure.sh back to "Shredder" (I changed it to Thunderbird to fix bustage).
- Revert the change to mail/app/Makefile.in to match attachment 327867 [details] [diff] [review].

The first item I had r=reed over irc from. The last two I'll just revert it back, as they were already reviewed in bug 397621.

We also need to fix the Sunbird tinderboxes as well.

This all depends on getting bug 443397 fixed as we need the tinderboxes to be updating themselves.

Comment 1

[Mark Banner (:standard8)]

Attachment: Patch to revert/put back the changes.

Comment 2

[Mark Banner (:standard8)]

Attachment: [checked in] Lightning tinder-config.pl fix.

Comment 3

[Mark Banner (:standard8)]

Attachment: [checked in] Patch to revert/put back the changes.

This is the correct patch for setting the correct changes. The tinder-config.pl bit is r=reed (over irc). The rest is r=davida,bienvenu as per the original bug.

Comment 4

[ause]

Comment on attachment 327947 [details] [diff] [review]
[checked in] Lightning tinder-config.pl fix.

it's the lightning tinder-config.pl. sunbird shouldn't change to "shredder"
iirc, updating tinder-config.pl should work on that box.

Comment 5

[Vlado Valastiak [:wladow]]

L10n builds still use Mozilla Thunderbird branding.

Comment 6

[Mark Banner (:standard8)]

Henrik unless you know otherwise, I believe this only affects Mac.

(In reply to comment #5)
> L10n builds still use Mozilla Thunderbird branding.

I'll look at fixing that in the next couple of days.

Comment 7

[Henrik Skupin [:whimboo][⌚️UTC+2]]

Indeed. It was a slip on my side that I changed OS to all. But Platform All is still valid.

Comment 8

[Mark Banner (:standard8)]

This is now checked in, although the lightning mac box needs a Clobber (semi-automatic clobber isn't working...), I'm going to mark this fixed, I'll cover the l10n builds in a separate bug.

Comment 9

[Henrik Skupin [:whimboo][⌚️UTC+2]]

Mark, what about the user agent string? There is Thunderbird still visible:

Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.0.2pre) Gecko/2008071703 Thunderbird/3.0a2pre ID:2008071703

Or was your check-in too late for today's nightly build?

Comment 10

[Henrik Skupin [:whimboo][⌚️UTC+2]]

Sorry Mark, that I have to reopen the bug. But the user agent still contains Thunderbird. It should also show Shredder like it's done for Gran Paradiso/Minefield.

Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.0.2pre) Gecko/2008071803 Thunderbird/3.0a2pre ID:2008071803

Comment 11

[Mark Banner (:standard8)]

Attachment: [checked in] Adjust the user agent for unofficial builds

This fixes the user-agent in the same manner that Firefox does it. I've changed to @...@ notation and filter substitution as I think its slightly nicer than the expand way.

Comment 12

[Mark Banner (:standard8)]

Should be fixed now. Let's deal with any other issues in separate bugs please.

Comment 13

[Henrik Skupin [:whimboo][⌚️UTC+2]]

Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1a2pre) Gecko/2008072900 Shredder/3.0a2pre ID:2008072900

Looks wonderful. Verified with the above copy of the user agent.