308973 - Rebrand Firefox trunk and 1.8 branch builds to avoid confusion

Status: RESOLVED FIXED

(Firefox :: General, defect, P2)

Description

[Guillermo López :willyaranda (probably SLOW response)]

User-Agent:       Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9a1) Gecko/20050917 Firefox/1.6a1
Build Identifier: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9a1) Gecko/20050917 Firefox/1.6a1

I think that Mozilla Foundation should rename the trunk version of Firefox. It
name is Deer Park Alpha 2 and it is confusing for the people, it can be confuse:
Firefox 1.5 alpha is Deer Park Alpha 2 (with Gecko 1.8 branch) and Firefox 1.5+
(1.6a1) with Gecko 1.9 is Deer Park Alpha 2. I think that a good name can be
"The Ocho alpha 1" (codename of the Firefox 2)

Reproducible: Always

Comment 1

[u88484]

Attachment: Patch for Firefox/Webtools/startpage

Still need any folders and icons with deerpark in the name to be renamed to
theocho...donno who can do those. Thunderbird patch coming up.

Comment 2

[u88484]

(In reply to comment #1)
> Created an attachment (id=199008) [edit]
> Patch for Firefox/Webtools/startpage
> 
> Still need any folders and icons with deerpark in the name to be renamed to
> theocho...donno who can do those. Thunderbird patch coming up.

Nevermind, thought TB was rebranded to deer park also.

Comment 3

[u88484]

Forgot to mention that with my patch the title bar will report 'The Ocho
(Nightly Build)' to try and furthermore try to prevent confusion on these being
stable releases.

Comment 4

[Benjamin Smedberg]

*** Bug 313898 has been marked as a duplicate of this bug. ***

Comment 5

[Daniel C]

This won't fix non-branded builds. They should be call "Browser" as prior to Deer Park.

See:
http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/browser/locales/en-US/chrome/branding/brand.dtd&rev=1.1#1
http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/browser/locales/en-US/chrome/branding/brand.properties&rev=1.1#1

lxr.mozilla.org hits for Deer Park and DeerPark on 1.8 Branch and Trunk:

http://lxr.mozilla.org/mozilla1.8/search?string=Deer+Park (9 hits)
http://lxr.mozilla.org/mozilla1.8/search?string=DeerPark (8 hits)

http://lxr.mozilla.org/mozilla/search?string=Deer+Park (20 hits)
http://lxr.mozilla.org/mozilla/search?string=DeerPark (14 hits)

Comment 6

[Daniel C]

Bug 294399 was the original rebranding bug for reference.

Comment 7

[Frank Yan (:fryn)]

it definitely should NOT be renamed 'The Ocho', here's why:

"The trunk will not be The Ocho after all. The Ocho will be the 1.8.1 branch which firefox 2.0 will be released from. So there is no name to rename the trunk to. The trunk actually continues forever. Only the BRANCHES from the trunk should be renamed.

See the NEW roadmap draft image:
http://cbeard.typepad.com/photos/uncategorized/releaseroadmapdraftv1_2.png

But I do agree that "Deer Park" is NOT an appropriate name for the trunk.

I think it should be renamed 'Mozilla Firefox Trunk' and then whenever they branch, just rename it to 'Mozilla Firefox'."

Comment 8

[Frank Yan (:fryn)]

Attachment: The New Roadmap [DRAFT]

This shows why the trunk shouldn't be renamed to "The Ocho" but rather to something like "Mozilla Firefox [Trunk]"

Comment 9

[u88484]

Comment on attachment 199008 [details] [diff] [review]
Patch for Firefox/Webtools/startpage

obsoleteing attachment since 2.0 will be from the branch...this bug should probably be close but I'll leave that up to someone else incase what I stated above isn't true.

Comment 10

[Frank Yan (:fryn)]

(In reply to comment #9)
> (From update of attachment 199008 [details] [diff] [review] [edit])
> obsoleteing attachment since 2.0 will be from the branch...this bug should
> probably be close but I'll leave that up to someone else incase what I stated
> above isn't true.
> 

What you said was true.

I think you should open a new bug saying that the Trunk should NOT be named "Deer Park" and be named either just "Mozilla Firefox" or "Mozilla Firefox [Trunk]"

Comment 11

[Jonathan Stanley]

(In reply to comment #10)
> (In reply to comment #9)
> > (From update of attachment 199008 [details] [diff] [review] [edit] [edit])
> > obsoleteing attachment since 2.0 will be from the branch...this bug should
> > probably be close but I'll leave that up to someone else incase what I stated
> > above isn't true.
> > 
> 
> What you said was true.
> 
> I think you should open a new bug saying that the Trunk should NOT be named
> "Deer Park" and be named either just "Mozilla Firefox" or "Mozilla Firefox
> [Trunk]"
> 

Or brand it "The Next++; Big Thing"... ;)

Comment 12

[Robin Monks]

Can't it just be Firefox Nightly?

Nah, too simple ;-)

Robin

Comment 13

[james.bugzilla]

(In reply to comment #12)
> Can't it just be Firefox Nightly?
> 
> Nah, too simple ;-)
> 
> Robin
> 

How about just lablel by it what it is as in "Trunk Nightly"

The 1.8.x branch is Firefox 1.5 and then on to Firefox 2.0 right? so how about just separating the Trunk by not really giving it a name other than naming it by what it is as in "Trunk Nightly" for example.

Comment 14

[Jo Hermans]

*** Bug 318832 has been marked as a duplicate of this bug. ***

Comment 15

[Marek Stępień [:marcoos, inactive]]

I submitted bug 322132 for going back to the pre-DPA1 state ("Browser"/"Gecko Browser").

Comment 16

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

*** Bug 322132 has been marked as a duplicate of this bug. ***

Comment 17

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

bug 294399

Comment 18

[Marek Stępień [:marcoos, inactive]]

Attachment: Patch reverting brand names back to "Gecko Browser"

Note: this is without the webtools part Kurt had in his patch.

Also, changes to the browser/app/macbuild/dsstore are probably required, since it contains the "DeerPark" string, but it's a Mac binary file I have no idea about. ;-)

The new image for the about dialog is in attachment 207354 [details] (browser/base/branding/about.png).

Comment 19

[Daniel C]

Comment on attachment 207357 [details] [diff] [review]
Patch reverting brand names back to "Gecko Browser"

>Index: configure.in
>===================================================================
>RCS file: /cvsroot/mozilla/configure.in,v
>retrieving revision 1.1577
>diff -u -8 -p -r1.1577 configure.in
>--- configure.in	23 Dec 2005 21:05:20 -0000	1.1577
>+++ configure.in	2 Jan 2006 19:20:58 -0000
>@@ -4170,17 +4170,17 @@ suite)

>-  MOZ_APP_DISPLAYNAME=DeerPark
>+  MOZ_APP_DISPLAYNAME=GeckoBrowser

I think the equivalent of 'DeerPark' in unofficial branding terms is 'Browser'. According to the mozilla/browser/locales/en-US/chrome/branding/brand.dtd changes in https://bugzilla.mozilla.org/attachment.cgi?id=184025&action=diff anyway.

>Index: configure
>===================================================================
>RCS file: /cvsroot/mozilla/configure,v
>retrieving revision 1.1574
>diff -u -8 -p -r1.1574 configure
>--- configure	1 Jan 2006 12:26:12 -0000	1.1574
>+++ configure	2 Jan 2006 19:21:15 -0000
>@@ -12922,17 +12922,17 @@ suite)

>-  MOZ_APP_DISPLAYNAME=DeerPark
>+  MOZ_APP_DISPLAYNAME=GeckoBrowser

Changes to configure aren't needed, they'll be automatically generated.

>Index: browser/app/macbuild/license.r
>===================================================================
>RCS file: /cvsroot/mozilla/browser/app/macbuild/license.r,v
>retrieving revision 1.1
>diff -u -8 -p -r1.1 license.r
>--- browser/app/macbuild/license.r	18 Aug 2005 13:29:53 -0000	1.1
>+++ browser/app/macbuild/license.r	2 Jan 2006 19:21:15 -0000
>@@ -22,39 +22,39 @@ resource 'STR#' (5000, "English") {

>-    "You are about to install Deer Park.\n"
>+    "You are about to install Gecko Browser.\n"

Browser?

>-  "DEER PARK END-USER SOFTWARE LICENSE AGREEMENT\n"
>+  "GECKO BROWSER END-USER SOFTWARE LICENSE AGREEMENT\n"

BROWSER?

>-  "A SOURCE CODE VERSION OF CERTAIN DEER PARK BROWSER FUNCTIONALITY THAT YOU MAY USE, MODIFY AND DISTRIBUTE IS AVAILABLE TO YOU FREE-OF-CHARGE FROM WWW.MOZILLA.ORG UNDER THE MOZILLA PUBLIC LICENSE and other open source software licenses.\n"
>+  "A SOURCE CODE VERSION OF CERTAIN GECKO BROWSER FUNCTIONALITY THAT YOU MAY USE, MODIFY AND DISTRIBUTE IS AVAILABLE TO YOU FREE-OF-CHARGE FROM WWW.MOZILLA.ORG UNDER THE MOZILLA PUBLIC LICENSE and other open source software licenses.\n"

BROWSER?

>-  "The accompanying executable code version of Deer Park and related documentation (the �Product�) is made available to you under the terms of this DEER PARK END-USER SOFTWARE LICENSE AGREEMENT (THE �AGREEMENT�).  BY CLICKING THE �ACCEPT� BUTTON, OR BY INSTALLING OR USING THE DEER PARK BROWSER, YOU ARE CONSENTING TO BE BOUND BY THE AGREEMENT.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT, DO NOT CLICK THE �ACCEPT� BUTTON, AND DO NOT INSTALL OR USE ANY PART OF THE DEER PARK BROWSER.\n"
>+  "The accompanying executable code version of Gecko Browser and related documentation (the �Product�) is made available to you under the terms of this GECKO BROWSER END-USER SOFTWARE LICENSE AGREEMENT (THE �AGREEMENT�).  BY CLICKING THE �ACCEPT� BUTTON, OR BY INSTALLING OR USING THE GECKO BROWSER BROWSER, YOU ARE CONSENTING TO BE BOUND BY THE AGREEMENT.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT, DO NOT CLICK THE �ACCEPT� BUTTON, AND DO NOT INSTALL OR USE ANY PART OF THE GECKO BROWSER.\n"

BROWSER...?

>-  "DURING THE DEER PARK INSTALLATION PROCESS, AND AT LATER TIMES, YOU MAY BE GIVEN THE OPTION OF INSTALLING ADDITIONAL COMPONENTS FROM THIRD-PARTY SOFTWARE PROVIDERS.  THE INSTALLATION AND USE OF THOSE THIRD-PARTY COMPONENTS MAY BE GOVERNED BY ADDITIONAL LICENSE AGREEMENTS.\n"
>+  "DURING THE GECKO BROWSER INSTALLATION PROCESS, AND AT LATER TIMES, YOU MAY BE GIVEN THE OPTION OF INSTALLING ADDITIONAL COMPONENTS FROM THIRD-PARTY SOFTWARE PROVIDERS.  THE INSTALLATION AND USE OF THOSE THIRD-PARTY COMPONENTS MAY BE GOVERNED BY ADDITIONAL LICENSE AGREEMENTS.\n"

BROWSER?

>Index: browser/base/branding/uninstall.properties
>===================================================================
>RCS file: /cvsroot/mozilla/browser/base/branding/uninstall.properties,v
>retrieving revision 1.1
>diff -u -8 -p -r1.1 uninstall.properties
>--- browser/base/branding/uninstall.properties	27 Jul 2005 18:24:54 -0000	1.1
>+++ browser/base/branding/uninstall.properties	2 Jan 2006 19:21:16 -0000
>@@ -1,6 +1,6 @@

>-fileUninstall=UninstallDeerPark.exe
>+fileUninstall=UninstallGeckoBrowser.exe

Browser?

>Index: browser/base/content/browserconfig.properties
>===================================================================
>RCS file: /cvsroot/mozilla/browser/base/content/browserconfig.properties,v
>retrieving revision 1.4
>diff -u -8 -p -r1.4 browserconfig.properties
>--- browser/base/content/browserconfig.properties	20 May 2005 22:42:49 -0000	1.4
>+++ browser/base/content/browserconfig.properties	2 Jan 2006 19:21:16 -0000
>@@ -1,2 +1,2 @@

>-browser.startup.homepage=http://www.mozilla.org/projects/deerpark/
>+browser.startup.homepage=http://www.mozilla.org/projects/firefox/

https://bugzilla.mozilla.org/attachment.cgi?id=184025&action=diff had http://www.mozilla.org/products/firefox/central.html as the URL previously. This now redirects to http://www.mozilla.com/firefox/central/ so I guess you could use that.

>Index: browser/installer/windows/installer.cfg
>===================================================================
>RCS file: /cvsroot/mozilla/browser/installer/windows/installer.cfg,v
>retrieving revision 1.20
>diff -u -8 -p -r1.20 installer.cfg
>--- browser/installer/windows/installer.cfg	18 Oct 2005 15:44:08 -0000	1.20
>+++ browser/installer/windows/installer.cfg	2 Jan 2006 19:21:16 -0000
>@@ -1,17 +1,17 @@

>-FileUninstall             = UninstallDeerPark.exe
>-FileUninstallZIP          = UninstallDeerPark.zip
>+FileUninstall             = UninstallGeckoBrowser.exe
>+FileUninstallZIP          = UninstallGeckoBrowser.zip

Browser?

I'm not a reviewer, but I was in the middle of making a patch for this bug myself (bit of a coincidence) so I thought I'd say what I've found.

As you said mozilla/sources/mozilla/browser/app/macbuild/dsstore (binary) has a reference as does mozilla/sources/mozilla/mail/app/macbuild/dsstore.
Also mozilla/sources/mozilla/build/package/mac_osx/pkg-dmg does too.

Comment 20

[Daniel C]

I would imagine you'd have to attach the new image to this bug too. At a guess either [e-mail] or [e-mail] could review the patch. It might be an idea to ask [e-mail] about tinderbox changes based on bug 294399 comment 68.

Comment 21

[Mike Connor [:mconnor]]

Trunk will just be "Browser" and 1.8 branch will be updated to Bon Echo, waiting on updated graphics.

Comment 22

[Frank Yan (:fryn)]

(In reply to comment #21)
> Trunk will just be "Browser" and 1.8 branch will be updated to Bon Echo,
> waiting on updated graphics.
> 

finally, some real action on this bug! :D

Comment 23

[gabe]

i think that trunk ver should be Firefox (trunk)

Comment 24

[Robin Monks]

(In reply to comment #23)
> i think that trunk ver should be Firefox (trunk)
> 

I agree, "Browser" is too general.

Comment 25

[Jonathan Stanley]

(In reply to comment #21)
> Trunk will just be "Browser" and 1.8 branch will be updated to Bon Echo,
> waiting on updated graphics.
> 

"Browser"? That's almost as poor as calling it "Internet" (Microsoft references notwithstanding). Considering the "Milestone" codenames have been pretty good... perhaps something a little more "worthy" is required to express the bleeding edge nature of trunk development?

Aside form "The Next++; Big Thing", for Gecko 1.9 at least... "Cairo" as the codename should do?

Comment 26

[OstGote!]

*** Bug 323152 has been marked as a duplicate of this bug. ***

Comment 27

[Mike Beltzner [:beltzner, not reading bugmail]]

--> taking

Current proposals:

1.8_BRANCH ==> Bon Echo
trunk =======> minefield, canary, boomstam (dutch for "trunk), firefox-trunk

Comment 28

[Mike Pesce (:By-Tor)]

Personally, I like Minefield or Boomstam, but Firefox-Trunk works as well (although, a bit lengthy.)

Comment 29

[Ben Goodger (use ben at mozilla dot org for email)]

How about simply, "Netscape 6"

;)

Comment 30

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

I'd go with Minefield or Boomstam.. Firefox-Trunk is way too generic. :)

Comment 31

[Dave Townsend [:mossop]]

(In reply to comment #30)
> I'd go with Minefield or Boomstam.. Firefox-Trunk is way too generic. :)
> 

Minefield is good. Boomstam is just going to have everyone asking wtf it is. Leave firefox out of it, the less chance that someone thinks of it as a working version of firefox the better I think.

Comment 32

[Nick Thomas [:nthomas] (UTC+12)]

*** Bug 325676 has been marked as a duplicate of this bug. ***

Comment 33

[Gervase Markham [:gerv]]

"Gecko Browser" is out - we don't own the Gecko trademark, and so that would lead to unnecessary complication.

How about "Firefox-Unstable"? That way, it's clear both that it's a form of Firefox and also that it's a version you shouldn't be using unless you know what you are doing. 

I'd rather we didn't create yet more names (e.g. "Minefield" or "Boomstam"); history tells us that names tend to stick, and then we end up having to do trademark work on them, and finding problems, and changing them, and it's all a mess.

Gerv

Comment 34

[Jonathan Stanley]

How about "Boomstam Minefield" for a bit of Anglo-Dutch creolo? :D

Comment 35

[Marek Stępień [:marcoos, inactive]]

(In reply to comment #33)
> How about "Firefox-Unstable"? That way, it's clear both that it's a form of
> Firefox and also that it's a version you shouldn't be using unless you know
> what you are doing. 

This seems reasonable, but it must also be the name for unofficial builds (e.g. those not using branding stuff from the other-licenses dir), and in the last year we were avoiding the Firefox name outside other-licenses/ (builds without -enable-official-branding were called either Gecko Browser or Deer Park).

Comment 36

[Gervase Markham [:gerv]]

Good point - I'd forgotten that. So no Firefox, then.

So does "Firefox 3" have a code name (like Deer Park and Bon Echo) yet? Code names are not so bad as long as they have a fixed, limited lifespan. This prevents them taking on a life of their own.

Gerv

Comment 37

[Mike Smith]

Another idea would be to follow the linux kernal development tradition and have odd numbers like FF 1.5.3 indicate development builds while even number represent either stable or branch builds

Comment 38

[Mike Beltzner [:beltzner, not reading bugmail]]

(In reply to comment #36)
> So does "Firefox 3" have a code name (like Deer Park and Bon Echo) yet? Code

Not yet, no, The idea behind this is that trunk will get a stable, unchanging codename that always means "this is the trunk build". At the same time, we'll rebrand the 1.8 branch to be "Bon Echo" since its eventual goal is to become the 1.8.1 branch that will be Firefox2.

(In reply to comment #37)
> odd numbers like FF 1.5.3 indicate development builds while even number
> represent either stable or branch builds

I think we have quite enough difficulty managing the numbering differences between Gecko Branches and their eventual product version numbers without adding any more complexity :)

Comment 39

[Daniel C]

Indeed, this has to fit all builds without official branding. Attachment 207537 [details] [diff] is essentially just reverting the changes made in bug 294399. Before those changes, unofficial builds were:

brandShortName "Browser"
brandFullName "Gecko Browser"
vendorName "Generic"

See here for proof: http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/browser/locales/en-US/chrome/branding/brand.dtd&rev=1.1&root=/cvsroot

In my opinion, unofficial branding should always have this naming, and any naming changes should only be made once trunk has branched, and only to official branding terms.

Comment 40

[Marek Stępień [:marcoos, inactive]]

(In reply to comment #39)
Read comment 33: Mozilla has no rights to the Gecko trademark. (Why?! Does Netscape/AOL still own it?)

Comment 41

[Brian Polidoro]

Would something like Generic XULRunner Browser work?

Comment 42

[Bob Clary [:bc] (inactive)]

Can we get this done on the 1.8 branch like soon? It is not possible in talkback to distinguish nightly Firefox builds on the 1.8.0 branch from nightly Firefox builds on the 1.8 branch since they both have identifiers in talkback like: MozillaOrgFirefox15Win322006030105. 

I don't care about the big picture branding issues: just change the Firefox version to 2.0a1 like was done on tbird today and change the rv to 1.8.1a1. Then you can deal with the other branding issues are your leasure.

Comment 43

[Gervase Markham [:gerv]]

If it is actually based on XULRunner, than XULRunner Browser would probably work.

I don't know the status of "XULRunner", and whether we are seeking a trademark.

Regardless, Bob is right - can someone with the relevant knowledge please prepare the patch he's asking for? Version number changes should be uncontroversial (famous last words...).

Gerv

Comment 44

[Gervase Markham [:gerv]]

XULRunner is not a registered trademark, but we have "first use in commerce" trademark rights to it. However, "XULRunner Browser" would probably be a reasonable title to put on trunk builds.

However, again, don't let this question hold up the version number change.

Gerv

Comment 45

[Benjamin Smedberg]

"XULRunner browser" is ridiculous. We won't be shipping XULRunner-based Firefoxen by default for a while yet.

Comment 46

[Gervase Markham [:gerv]]

OK, so basically we need the Parks and Gardens Management team to come up with another park-related name for Firefox 3. And then we can use that for the trunk.

Gerv

Comment 47

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

(In reply to comment #46)
> OK, so basically we need the Parks and Gardens Management team to come up with
> another park-related name for Firefox 3. And then we can use that for the
> trunk.

No, that would be wrong -- we specifically do not want the trunk to use a codename that will be used for Fx3 or any actual product (otherwise we'll end up in the situation we're in now again, just a few months later!).  The trunk name will always remain on the trunk, and the product will change its name once it's branched.

There have already been a bunch of good suggestions in this bug; I'd go with "Minefield" and leave it at that.

Comment 48

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: change branding elements to "Bon Echo" (for 1.8 branch)

This just changes the strings from "Deer Park" and "Firefox" to "Bon Echo" for the MOZILLA_1_8_BRANCH. Patch coming for trunk, as well ...

still need to
  - check in and update about.png (from attachment 215148 [details], bug 330533)
  - make the changes to the version number

Comment 49

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: changes version number to 2.0a1

for MOZILLA_1_8_BRANCH, this changes the browser version number to 2.0a1

Comment 50

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: change branding elements to "Minefield" (for trunk)

Comment 51

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: changes version number to 3.0a1

(this is for trunk)

Comment 52

[Gervase Markham [:gerv]]

Given history, before that patch gets checked in can someone _please_ check carefully that there is no existing open source project called "Minefield"?

Gerv

Comment 53

[Jonathan Stanley]

(In reply to comment #52)
> Given history, before that patch gets checked in can someone _please_ check
> carefully that there is no existing open source project called "Minefield"?
> 
> Gerv
> 

Searching for "minefield-*tar*"

http://www.google.com/search?q=%22minefield-*.tar*%22

Aside from references to licensing minefields... the only other results just appear to be obscure shareware games.

Comment 54

[PikeUK]

Comment on attachment 215282 [details] [diff] [review]
changes version number to 3.0a1

There's already a patch for this in Bug 330528, it looks like you might have missed a file as well (not that I know what I'm talking about).

Comment 55

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: changes version number to 2.0a1

reversions branch to 2.0a1, added the missing file (thanks, Axel!)

Comment 56

[Mike Beltzner [:beltzner, not reading bugmail]]

Comment on attachment 215282 [details] [diff] [review]
changes version number to 3.0a1

As Axel mentioned, this is handled in bug 330528, so I'll just mark this patch obsolete.

Comment 57

[PikeUK]

(In reply to comment #55)
> reversions branch to 2.0a1, added the missing file (thanks, Axel!)

I'm not Axel (I should probably get a different e-mail address for bugzilla to avoid confusion).

Comment 58

[Mike Connor [:mconnor]]

Comment on attachment 215271 [details] [diff] [review]
change branding elements to "Bon Echo" (for 1.8 branch) 

looks good.  When we land this, make sure someone's around to rejig the scripts to handle this right on Mac

Comment 59

[Steffen Wilberg]

Please also update the releaseBaseURL entity in browser/locales/en-US/chrome/branding/brand.dtd from http://www.mozilla.org/projects/deerpark/releases/ to bonecho/releases/.

Comment 60

[Mike Connor [:mconnor]]

Comment on attachment 215295 [details] [diff] [review]
changes version number to 2.0a1

I'm 99% sure this is right, but I'm going to ask dbaron to verify, since he's done way more of the version bumps than I have.

Comment 61

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Comment on attachment 215295 [details] [diff] [review]
changes version number to 2.0a1

sr=dbaron.  You're welcome to actually put a newline at the end of the file, though.

Comment 62

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Is the version going to become 2.0a1 on both trunk and branch?  Do we want to do something like 3.0a0 for the trunk?

Comment 63

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Never mind, I can't read; sorry for the spam.

Comment 64

[Mike Connor [:mconnor]]

landed the branch patches with the newline and the change to releaseBaseURL. Go beltzner!

Comment 65

[Asaf Romano (gone)]

The mac application menu title hasn't changed, there's a InfoPlist.strings file somewhere in browser/app/macbuild which has to be changed.

There's also an issue with the application bundle name:
http://lxr.mozilla.org/seamonkey/source/configure.in#4362

Comment 66

[Mark Mentovai]

Comment on attachment 215271 [details] [diff] [review]
change branding elements to "Bon Echo" (for 1.8 branch) 

> Index: browser/app/macbuild/license.r

This is still EULA v1.0.  It was never updated to 1.1 in bug 309693 because nobody seems to care what EULA belongs on unofficial-branding builds.

Comment 67

[Asaf Romano (gone)]

Also, there's http://lxr.mozilla.org/mozilla1.8/source/browser/installer/removed-files.in#67

Comment 68

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: missed a reference to Deer Park

Oops. I blame Textwrangler's search and replace for inexplicably not finding this string until I searched TWICE. Ugh.

(I've obsoleted the patch for trunk, and will refile an omnibus patch a little later today for that)

Comment 69

[Mike Beltzner [:beltzner, not reading bugmail]]

(In reply to comment #65)
> The mac application menu title hasn't changed, there's a InfoPlist.strings 
> file somewhere in browser/app/macbuild which has to be changed.

Mento tells me that it's actually picked up from MOZ_APP_NAME, which we leave as Firefox. At least, that's what we did back in the days of Deer Park, and in fear of licensing problems, I shall leave it that way here, too :)

> There's also an issue with the application bundle name:
> http://lxr.mozilla.org/seamonkey/source/configure.in#4362

I don't so much care about the seamonkey CVS path. The one I care about is here:
http://lxr.mozilla.org/mozilla1.8/source/configure#12932

(In reply to comment #67)
> Also, there's
> http://lxr.mozilla.org/mozilla1.8/source/browser/installer/removed-files.in#67

mconnor assures me that we don't use anything other than uninstall.exe anymore, so that's being left there for legacy purposes; this was not my intentional brilliance, however, so nice catch on something I'd missed! :) 

Comment 70

[pal-moz]

Help>About Bon Echo
copyright is still 1998-2005.

When will Trunk be rebranded.

Comment 71

[Allan Beaufour]

How about:
http://lxr.mozilla.org/mozilla1.8/source/browser/app/nsBrowserApp.cpp#46

Comment 72

[Benjamin Smedberg]

Allan, what about it? We want to use the Firefox profile, not a special BonEcho profile.

Comment 73

[Allan Beaufour]

(In reply to comment #72)
> Allan, what about it? We want to use the Firefox profile, not a special BonEcho
> profile.

s/Firefox/Bon Echo/ and s/2005/2006/ is what I meant

Comment 74

[pal-moz]

Help>About Bon Echo
copyright is still 1998-2005.

now 2006.

Comment 75

[Daniel C]

http://addict3d.org/index.php?page=downloadfile&ID=5528

"Mozilla Firefox 3.0 Alpha 1 (Deer Park Alpha 2)"

That's at least one site that has downloaded a trunk build, and thought it was Firefox 3.0 Alpha 1. OK, so that's what the version number says, but I doubt this confusion would have occurred had the application name not had the word "Alpha" in it.

I'm a bit skeptical about the name "Minefield" (also not sure if comment 52 has been addressed) but attachment 215281 [details] [diff] [review] would a least be a start...

I'm slightly confused, beltzner attached the patch, mconnor gave it r+ and then beltzner obsoleted it without checking it in...

What's the status of this?

Comment 76

[u88484]

Beltzner, I think you obsoleted the wrong patch in mid March.

[e-mail]  	2006-03-20 14:58:10 PDT  	  
Attachment #215281 [details] [diff] is obsolete  	    	1
Attachment #215706 [details] [diff]Flag 	  	review?([e-mail])

You obsoleted a trunk patch to renamed to Minefield with a branch patch to be renamed to Bon Echo.

Comment 77

[Daniel C]

http://digg.com/software/Firefox_3.0_Alpha_1_Already_Better_Than_Firefox_2.0_Alpha_1_
http://digg.com/software/Download_Firefox_3.
http://tech.cybernetnews.com/2006/04/08/test-firefox-30-alpha-1-yes-that-says-30/

'Good news' spreads fast...

Comment 78

[Mike Pesce (:By-Tor)]

(In reply to comment #77)
> http://digg.com/software/Firefox_3.0_Alpha_1_Already_Better_Than_Firefox_2.0_Alpha_1_
> http://digg.com/software/Download_Firefox_3.
> http://tech.cybernetnews.com/2006/04/08/test-firefox-30-alpha-1-yes-that-says-30/
> 
> 'Good news' spreads fast...
> 

I think this further indicates why the trunk needs to be renamed quickly. Whether there's a new graphic or not really doesn't matter as long as it avoids confusion for end-users who think they're getting the latest and greatest thing when it's merely an early alpha.  

Comment 79

[james.bugzilla]

Also http://www.9down.com/story.php?sid=6433

At least the sites are not linking to the Tinderbox anymore so far. http://developer.mozilla.org/en/docs/Tinderbox

Comment 80

[Marek Stępień [:marcoos, inactive]]

I think it would be nice to change the filenames as well (e.g. "minefield-3.0a1.blahblaf.tar.bz2" or even just "minefield.blahblah.tar.bz2" instead of "firefox-3.0a1.blahblah.tar.bz2"). Simply avoid "firefox" appearing simultaneously with "3.0a1" in the filenames.

This will surely reduce the number of premature articles about 3.0a1.

Comment 81

[Mike Beltzner [:beltzner, not reading bugmail]]

(In reply to comment #76)
> You obsoleted a trunk patch to renamed to Minefield with a branch patch to be
> renamed to Bon Echo.

No, that was intentional, as I'd missed a reference in the original Minefield patch. New one coming up shortly.

Comment 82

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: renames "Deer Park" to "Minefield" for trunk

Comment 83

[Mike Beltzner [:beltzner, not reading bugmail]]

ok, patch is in; steve garrity has promised me some artwork in bug 330533 shortly, so we'll hopefully have this (finally - my bad!) wrapped up today

Comment 84

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: renames "Deer Park" to "Minefield" for trunk

Bah - missed one reference. But this also serves as a reminder that we'll need to make some /minefield webpages on mozilla.org/projects as per these changes. Of course, I'm not sure what the /projects/minefield/releases/ structure will look like, since there won't ever be a "minefield" release (it will always be trunk, when we release the Fx3 alpha off of it we'll be renaming that to the Fx3 codename as per above discussion).

Something to ponder! :)

Comment 85

[u88484]

Mike Beltzner, we need to have a big scray message for the start page. Nothing elaborate or pretty (and definently not as busy as the beta/alpha release pages are because not everyone sees the message on there) since its not a release or ever going to be. Can be something short and simple like "THIS IS NOT A RELEASE/BETA/ALPHA SOFTWARE, THIS IS A DEV BUILD, USE AT OWN RISK!!! NO END USER SUPPORT WILL BE PROVIDED!" and then link to info about trunk builds and roadmap.

Comment 86

[Mike Connor [:mconnor]]

Comment on attachment 217862 [details] [diff] [review]
renames "Deer Park" to "Minefield" for trunk

shazam

Comment 87

[Mike Beltzner [:beltzner, not reading bugmail]]

When this is checked in, can attachment 217869 [details] (from bug 330533) please be checked in as well. Thanks!

(In reply to comment #85)
> Mike Beltzner, we need to have a big scray message for the start page. Nothing
> elaborate or pretty (and definently not as busy as the beta/alpha release 

Filed bug 333476 for the creation of those pages.

Comment 88

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

Comment on attachment 217862 [details] [diff] [review]
renames "Deer Park" to "Minefield" for trunk

Landed this and attachment 217869 [details] on the trunk.

Comment 89

[PikeUK]

(In reply to comment #88)
> (From update of attachment 217862 [details] [diff] [review] [edit])
> Landed this and attachment 217869 [details] [edit] on the trunk.

There's every chance I'm missing something obvious, but the configure.in change from attachment 217862 [details] [diff] [review] doesn't seem to have been checked in.

Comment 90

[Mike Beltzner [:beltzner, not reading bugmail]]

Hm. From http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=all&branch=HEAD&branchtype=match&dir=&file=&filetype=match&who=gavin&whotype=regexp&sortby=Date&hours=2&date=explicit&mindate=2006-04-10&maxdate=2006-04-11&cvsroot=%2Fcvsroot I see:

mozilla/browser/base/branding/about.png                 1.3 	
mozilla/browser/base/branding/uninstall.properties 	1.3
mozilla/browser/base/content/browserconfig.properties 	1.5 	
mozilla/browser/app/macbuild/license.r 	                1.2
mozilla/browser/installer/unix/installer.cfg            1.8 
mozilla/browser/installer/windows/installer.cfg         1.22
mozilla/browser/installer/windows/uninstaller.inc       1.2
mozilla/browser/locales/en-US/chrome/branding/brand.dtd 1.5
mozilla/browser/locales/en-US/chrome/branding/brand.properties  1.4

Oops?

Comment 91

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

I checked in the missing configure.in check on the trunk. Thanks for catching that Pike. This turned atlantia red, but rhelmer updated tinderconfig (thanks Robert!) so it should go green.

Comment 92

[Uri Bernstein]

OS X: The application menu is still labled "Deer Park" (although its top item is "About Minefield").
Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.9a1) Gecko/20060412 Firefox/3.0a1

Comment 93

[Mike Beltzner [:beltzner, not reading bugmail]]

Hm. I can't see any references in LXR that would be causing this, and wonder if it might be due to the tinderbox configuration. Let me kick off a full local build and see what happens ...

Comment 94

[Brian Polidoro]

Not a big deal but aboutCredits.png wasn't changed.  

Comment 95

[Mike Beltzner [:beltzner, not reading bugmail]]

Attachment: new InfoPlist.strings file with "Minefield" and "Copyright 2005-2006"

bsmedberg's a start and told me that the OS X menu bar name is grabbed from /browser/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings. Here's a new one; worked for me in my local tree, so I think my text editor even saved it with the right UTF settings, but someone should check me on that.

Comment 96

[Reed Loden [:reed]]

Comment on attachment 218185 [details]
new InfoPlist.strings file with "Minefield" and "Copyright 2005-2006"

You say 2005-2006 in the attachment comment, but 1998-2006 is what is in the file. Which do you mean? :)

Comment 97

[Phil Ringnalda (:philor)]

*** Bug 333736 has been marked as a duplicate of this bug. ***

Comment 98

[Mike Connor [:mconnor]]

Comment on attachment 218185 [details]
new InfoPlist.strings file with "Minefield" and "Copyright 2005-2006"

r=me, subject to followup about where the official-branding bits come from

Comment 99

[Asaf Romano (gone)]

Comment on attachment 218185 [details]
new InfoPlist.strings file with "Minefield" and "Copyright 2005-2006"

checked this in.

Comment 100

[u88484]

The update status during restart still reads Firefox and not minefield

Comment 101

[Rishi Maharaj]

"Firefox" is hardcoded to the update dialog:

http://lxr.mozilla.org/mozilla/source/browser/locales/en-US/updater/updater.ini