[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[mrowe at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 4b638e638d69f210a56dab2647cecfd93049fb22
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 24 22:05:40 2009 +0000

    Land the configuration that includes the two debug GTK Linux builders.
    
    * BuildSlaveSupport/build.webkit.org-config/config.json:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51356 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 4751fe9..69ff238 100644
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
@@ -22,6 +22,8 @@
                     { "name": "apple-windows-4", "platform": "win"},
 
                     { "name": "gtk-linux-slave-1", "platform": "gtk"},
+                    { "name": "gtk-linux-slave-2", "platform": "gtk"},
+                    { "name": "gtk-linux-slave-3", "platform": "gtk"},
 
                     { "name": "szeged-linux-1", "platform": "qt"},
 
@@ -95,6 +97,16 @@
                       "slavenames": ["gtk-linux-slave-1"]
                     },
                     {
+                      "name": "GTK Linux 32-bit Debug", "type": "BuildAndTest", "builddir": "gtk-linux-32-debug",
+                      "platform": "gtk", "configuration": "debug", "architectures": ["i386"],
+                      "slavenames": ["gtk-linux-slave-2"]
+                    },
+                    {
+                      "name": "GTK Linux 64-bit Debug", "type": "BuildAndTest", "builddir": "gtk-linux-64-debug",
+                      "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
+                      "slavenames": ["gtk-linux-slave-3"]
+                    },
+                    {
                       "name": "Qt Linux Release", "type": "BuildAndTest", "builddir": "qt-linux-release",
                       "platform": "qt", "configuration": "release", "architectures": ["i386"],
                       "slavenames": ["szeged-linux-1"]
@@ -120,7 +132,8 @@
                       "builderNames": ["Tiger Intel Release", "Leopard Intel Release (Build)", "Leopard Intel Debug (Build)",
                                        "SnowLeopard Intel Release (Build)", "SnowLeopard Intel Leaks",
                                        "Windows Release (Build)", "Windows Debug (Build)",
-                                       "GTK Linux Release", "Qt Linux Release",
+                                       "GTK Linux Release", "GTK Linux 32-bit Debug", "GTK Linux 64-bit Debug",
+                                       "Qt Linux Release",
                                        "Chromium Win Release", "Chromium Mac Release", "Chromium Linux Release"]
                     },
                     { "type": "Triggerable", "name": "leopard-intel-release-tests",
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e42ff8c..65145be 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-24  Mark Rowe  <mrowe at apple.com>
+
+        Land the configuration that includes the two debug GTK Linux builders.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+
 2009-11-24  David Kilzer  <ddkilzer at apple.com>
 
         <http://webkit.org/b/31840> bisect-builds broke after r50080

-- 
WebKit Debian packaging