From ef421b1c5a911c42ac7489dd1261e78d4b156585 Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Fri, 8 Nov 2013 15:38:44 +0100
Subject: [PATCH] remove some old versions, bump mincount, bump dashboard for
 Android

---
 dashboard/dashboard.js |  2 +-
 get-components.php     | 14 --------------
 get-devicecrashes.php  | 10 ----------
 get-explosives.php     | 10 ++--------
 get-flashhangs.php     |  6 ------
 get-startupcrashes.php | 20 ++++++--------------
 6 files changed, 9 insertions(+), 53 deletions(-)

diff --git a/dashboard/dashboard.js b/dashboard/dashboard.js
index 315da9b..c55edb8 100644
--- a/dashboard/dashboard.js
+++ b/dashboard/dashboard.js
@@ -82,7 +82,7 @@ var gProductData = {
       },
       beta: {
         name: "Beta",
-        version: "26.0b1",
+        version: "26.0b2",
         appendver: true,
         adu: { low: 1e5, min: 1e4 },
         rate: { high: 2, max: 5 },
diff --git a/get-components.php b/get-components.php
index c2fd66b..7f409d5 100755
--- a/get-components.php
+++ b/get-components.php
@@ -59,10 +59,6 @@ $reports = array(array('product'=>'Firefox',
                        'version_regex'=>'25\.0.*',
                        'version_display'=>'25',
                       ),
-                 array('product'=>'Firefox',
-                       'channel'=>'beta',
-                       'version'=>'25.0',
-                      ),
                  array('product'=>'Firefox',
                        'channel'=>'beta',
                        'version'=>'26.0',
@@ -73,22 +69,12 @@ $reports = array(array('product'=>'Firefox',
                  array('product'=>'Firefox',
                        'channel'=>'aurora',
                       ),
-                 array('product'=>'FennecAndroid',
-                       'channel'=>'release',
-                       'version'=>'24.0',
-                       'version_regex'=>'24\.0.*',
-                       'version_display'=>'24',
-                      ),
                  array('product'=>'FennecAndroid',
                        'channel'=>'release',
                        'version'=>'25.0',
                        'version_regex'=>'25\.0.*',
                        'version_display'=>'25',
                       ),
-                 array('product'=>'FennecAndroid',
-                       'channel'=>'beta',
-                       'version'=>'25.0',
-                      ),
                  array('product'=>'FennecAndroid',
                        'channel'=>'beta',
                        'version'=>'26.0',
diff --git a/get-devicecrashes.php b/get-devicecrashes.php
index 3a0784a..3e79201 100755
--- a/get-devicecrashes.php
+++ b/get-devicecrashes.php
@@ -36,21 +36,11 @@ date_default_timezone_set('America/Los_Angeles');
 //   version - empty is all versions
 
 $reports = array(array('product'=>'FennecAndroid',
-                       'channel'=>'release',
-                       'version'=>'24.0',
-                       'version_regex'=>'24\.0.*',
-                       'version_display'=>'24',
-                      ),
-                 array('product'=>'FennecAndroid',
                        'channel'=>'release',
                        'version'=>'25.0',
                        'version_regex'=>'25\.0.*',
                        'version_display'=>'25',
                       ),
-                 array('product'=>'FennecAndroid',
-                       'channel'=>'beta',
-                       'version'=>'25.0',
-                      ),
                  array('product'=>'FennecAndroid',
                        'channel'=>'beta',
                        'version'=>'26.0',
diff --git a/get-explosives.php b/get-explosives.php
index 9094e52..125fd27 100755
--- a/get-explosives.php
+++ b/get-explosives.php
@@ -48,7 +48,7 @@ $reports = array(array('product'=>'Firefox',
                       ),
                  array('product'=>'Firefox',
                        'version'=>'24',
-                       'version_regex'=>'24\..*',
+                       'version_regex'=>'24\..*', // keep around for ESR
                        'fake_adu'=>false,
                        'mincount'=>100,
                       ),
@@ -56,7 +56,7 @@ $reports = array(array('product'=>'Firefox',
                        'version'=>'25',
                        'version_regex'=>'25\..*',
                        'fake_adu'=>false,
-                       'mincount'=>50,
+                       'mincount'=>80,
                       ),
                  array('product'=>'Firefox',
                        'version'=>'26',
@@ -96,12 +96,6 @@ $reports = array(array('product'=>'Firefox',
                        'fake_adu'=>false,
                        'mincount'=>6,
                       ),
-                 array('product'=>'FennecAndroid',
-                       'version'=>'24',
-                       'version_regex'=>'24\..*',
-                       'fake_adu'=>false,
-                       'mincount'=>50,
-                      ),
                  array('product'=>'FennecAndroid',
                        'version'=>'25',
                        'version_regex'=>'25\..*',
diff --git a/get-flashhangs.php b/get-flashhangs.php
index 874e428..dcabb8c 100755
--- a/get-flashhangs.php
+++ b/get-flashhangs.php
@@ -67,12 +67,6 @@ $reports = array(array('product'=>'Firefox',
                  array('product'=>'Firefox',
                        'version'=>'26.0',
                       ),
-                 array('product'=>'Firefox',
-                       'version'=>'26.0a2',
-                      ),
-                 array('product'=>'Firefox',
-                       'version'=>'27.0a1',
-                      ),
                  array('product'=>'Firefox',
                        'version'=>'27.0a2',
                       ),
diff --git a/get-startupcrashes.php b/get-startupcrashes.php
index e5770c2..56825ff 100755
--- a/get-startupcrashes.php
+++ b/get-startupcrashes.php
@@ -51,6 +51,12 @@ $reports = array(array('product'=>'Firefox',
                        'version_regex'=>'17\.0.*',
                        'version_display'=>'17 ESR',
                       ),
+                 array('product'=>'Firefox',
+                       'channel'=>'esr',
+                       'version'=>'24',
+                       'version_regex'=>'24\.*',
+                       'version_display'=>'24 ESR',
+                      ),
                  array('product'=>'Firefox',
                        'channel'=>'release',
                        'version'=>'24.0',
@@ -63,10 +69,6 @@ $reports = array(array('product'=>'Firefox',
                        'version_regex'=>'25\.0.*',
                        'version_display'=>'25',
                       ),
-                 array('product'=>'Firefox',
-                       'channel'=>'beta',
-                       'version'=>'25.0',
-                      ),
                  array('product'=>'Firefox',
                        'channel'=>'beta',
                        'version'=>'26.0',
@@ -83,22 +85,12 @@ $reports = array(array('product'=>'Firefox',
                  array('product'=>'MetroFirefox',
                        'channel'=>'nightly',
                       ),
-                 array('product'=>'FennecAndroid',
-                       'channel'=>'release',
-                       'version'=>'24.0',
-                       'version_regex'=>'24\.0.*',
-                       'version_display'=>'24',
-                      ),
                  array('product'=>'FennecAndroid',
                        'channel'=>'release',
                        'version'=>'25.0',
                        'version_regex'=>'25\.0.*',
                        'version_display'=>'25',
                       ),
-                 array('product'=>'FennecAndroid',
-                       'channel'=>'beta',
-                       'version'=>'25.0',
-                      ),
                  array('product'=>'FennecAndroid',
                        'channel'=>'beta',
                        'version'=>'26.0',