[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mrowe at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 50ef4d5f5a6b76685ca8d3554dba563f56e7eefb
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 19 21:58:57 2010 +0000

    Clean up the buildbot configuration a little.
    
    * BuildSlaveSupport/build.webkit.org-config/config.json:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63690 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
index bda3921..93f1c11 100644
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
@@ -1,8 +1,6 @@
 {
     "slaves":     [ { "name": "test-slave", "platform": "*" },
 
-                    { "name": "bdash-slave-2", "platform": "mac-tiger" },
-
                     { "name": "apple-xserve-1", "platform": "mac-leopard" },
                     { "name": "apple-xserve-2", "platform": "mac-leopard" },
                     { "name": "apple-xserve-3", "platform": "mac-leopard" },
@@ -46,12 +44,7 @@
                     { "name": "google-new-tests", "platform": "mac-leopard" }
                   ],
 
-    "builders":   [ { "name": "Tiger Intel Release", "type": "BuildAndTest", "builddir": "tiger-intel-release",
-                    "platform": "mac-tiger", "configuration": "release", "architectures": ["i386"],
-                    "slavenames": ["bdash-slave-2", "test-slave"]
-                    },
-
-                    { "name": "Leopard Intel Release (Build)", "type": "Build", "builddir": "leopard-intel-release",
+    "builders":   [ { "name": "Leopard Intel Release (Build)", "type": "Build", "builddir": "leopard-intel-release",
                       "platform": "mac-leopard", "configuration": "release", "architectures": ["i386"],
                       "triggers": ["leopard-intel-release-tests"],
                       "slavenames": ["apple-xserve-1", "apple-xserve-2", "test-slave"]
@@ -193,7 +186,7 @@
                   ],
 
     "schedulers": [ { "type": "AnyBranchScheduler", "name": "trunk", "branches": ["trunk"], "treeStableTimer": 45.0,
-                      "builderNames": ["Tiger Intel Release", "Leopard Intel Release (Build)", "Leopard Intel Debug (Build)",
+                      "builderNames": ["Leopard Intel Release (Build)", "Leopard Intel Debug (Build)",
                                        "SnowLeopard Intel Release (Build)", "SnowLeopard Intel Leaks",
                                        "Windows Release (Build)", "Windows Debug (Build)",
                                        "GTK Linux 32-bit Release", "GTK Linux 32-bit Debug", "GTK Linux 64-bit Debug", "GTK Linux 64-bit Release",
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6eac4b5..e8ca87a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-19  Mark Rowe  <mrowe at apple.com>
+
+        Clean up the buildbot configuration a little.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+
 2010-07-19  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Darin Adler.

-- 
WebKit Debian packaging