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

dumi at chromium.org dumi at chromium.org
Thu Apr 8 02:02:43 UTC 2010


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

    Unreviewed, build fix.
    
    * pywebsocket/mod_pywebsocket/standalone.py:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55337 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3533a65..4f3f19e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,11 @@
 2010-02-26  Dumitru Daniliuc  <dumi at chromium.org>
 
+        Unreviewed, build fix.
+
+        * pywebsocket/mod_pywebsocket/standalone.py:
+
+2010-02-26  Dumitru Daniliuc  <dumi at chromium.org>
+
         Reviewed by Dimitri Glazkov.
 
         Moving the script to the right location.
diff --git a/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py b/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py
index a953afa..1302e13 100755
--- a/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py
+++ b/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py
@@ -36,7 +36,7 @@ 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
+import standalone
 
 if __name__ == '__main__':
     standalone._main()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list