bug 420947: bootstrap changes to support new patcher2.pl prettyVersion. r=rhelmer, patch=me

tools/release/Bootstrap/Step/PatcherConfig.pm

@@ -86,6 +86,7 @@ sub BumpPatcherConfig {
     my $product = $config->Get(var => 'product');
     my $configBumpDir = $config->Get(var => 'configBumpDir');
     my $version = $config->GetVersion(longName => 0);
+    my $prettyVersion = $config->GetVersion(longName => 1);
     my $oldVersion = $config->GetOldVersion(longName => 0);
     my $rc = $config->Get(var => 'rc');
     my $oldRc = $config->Get(var => 'oldRc');
@@ -220,12 +221,8 @@ sub BumpPatcherConfig {
     $appObj->{'release'}->{$version} = $releaseObj = {};
 
     $releaseObj->{'schema'} = '1';
-    if ($config->Exists(var => 'prettyAusVersion')) {
-        $releaseObj->{'version'} = $config->Get(var => 'prettyAusVersion');
-    } else {
-        $releaseObj->{'version'} = $version;
-    }
-    $releaseObj->{'extension-version'} = $version;
+    $releaseObj->{'version'} = $releaseObj->{'extension-version'} = $version;
+    $releaseObj->{'prettyVersion'} = $prettyVersion;
 
     my $linBuildId;
     my $winBuildId;

tools/release/configs/fx-moz19-bootstrap.cfg

@@ -1,5 +1,4 @@
 version         = 3.0b4
-prettyAusVersion = 3 Beta 4
 milestone       = 1.9b4
 # _RCn and _RELEASE will be appended as-needed
 productTag      = FIREFOX_3_0b4

tools/release/configs/fx-moz19-staging-bootstrap.cfg

@@ -1,5 +1,4 @@
 version         = 3.0b3
-prettyAusVersion = Firefox 3 Beta 3
 milestone       = 1.9b3
 # _RCn and _RELEASE will be appended as-needed
 productTag      = FIREFOX_3_0b3