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

[dumi at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit a746917dee2e16b9772cd86ebed2df9aced970e6
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 27 01:51:57 2010 +0000

    Adding pywebsocket/standalone.py back to fix the Chromium webkit
    canaries. Once all layout tests pass, we can get in the patch that
    moves this directorty to WebKitTools/Scripts, update all Chromium
    scripts, and revert this patch.
    
    Reviewed by Adam Barth.
    
    https://bugs.webkit.org/show_bug.cgi?id=35464
    
    * pywebsocket: Added.
    * pywebsocket/standalone.py: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55329 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index eae0f27..361e4ea 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-26  Dumitru Daniliuc  <dumi at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Adding pywebsocket/standalone.py back to fix the Chromium webkit
+        canaries. Once all layout tests pass, we can get in the patch that
+        moves this directorty to WebKitTools/Scripts, update all Chromium
+        scripts, and revert this patch.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35464
+
+        * pywebsocket: Added.
+        * pywebsocket/standalone.py: Added.
+
 2010-02-26  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Xan Lopez.
diff --git a/WebKitTools/pywebsocket/standalone.py b/WebKitTools/pywebsocket/standalone.py
new file mode 100755
index 0000000..0eb4a0d
--- /dev/null
+++ b/WebKitTools/pywebsocket/standalone.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+# Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Wrapper around WebKitTools/Scripts/webkitpy/thirdparty/pywebsocket/mod_pywebsocket/standalone.py"""
+import os
+import sys
+
+sys.path.append(os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])),
+                             "..", "Scripts", "webkitpy", "thirdparty",
+                             "pywebsocket", "mod_pywebsocket"))
+import standalone.py
+
+if __name__ == '__main__':
+    standalone._main()

-- 
WebKit Debian packaging