[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 1fc367c51b76ae86e08c89ed130a3a085b75f58a
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 3 00:16:57 2010 +0000

    2010-03-02  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by David Levin.
    
            Revert r55339 - the Chromium codebase downstream had a temporary
            need for WebKitTools/pywebsocket to still exist after Chris Jerdonek
            had moved it (scripts still referenced the old location). Those
            scripts have been updated to the new location, so it should be safe
            to delete this now.
    
            https://bugs.webkit.org/show_bug.cgi?id=35614
    
            * pywebsocket/mod_pywebsocket/standalone.py: Removed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55439 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4327f37..8b25bd0 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,19 @@
 2010-03-02  Dirk Pranke  <dpranke at chromium.org>
 
+        Reviewed by David Levin.
+
+        Revert r55339 - the Chromium codebase downstream had a temporary
+        need for WebKitTools/pywebsocket to still exist after Chris Jerdonek
+        had moved it (scripts still referenced the old location). Those
+        scripts have been updated to the new location, so it should be safe
+        to delete this now.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35614
+
+        * pywebsocket/mod_pywebsocket/standalone.py: Removed.
+
+2010-03-02  Dirk Pranke  <dpranke at chromium.org>
+
         Reviewed by Dimitri Glazkov.
 
         new-run-webkit-tests on chromium-linux tests to see if
diff --git a/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py b/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py
deleted file mode 100755
index 9e58e2d..0000000
--- a/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2010, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""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"))
-from mod_pywebsocket import standalone
-
-if __name__ == '__main__':
-    standalone._main()

-- 
WebKit Debian packaging