[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[cjerdonek at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3e6df5c52f32b47dc6e28d8883b5b7582b582e46
Author: cjerdonek at webkit.org <cjerdonek at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 20 20:44:13 2010 +0000

    Moved simplejson into webkitpy/thirdparty directory.
    
    Reviewed by Adam Barth.
    
    https://bugs.webkit.org/show_bug.cgi?id=35196
    
    * Scripts/run-chromium-webkit-tests:
      - Added webkitpy/thirdparty to the script's search path.
    
    * Scripts/webkitpy/thirdparty/simplejson: Copied from WebKitTools/simplejson.
      - Copied simplejson directory.
    
    * simplejson: Removed.
    * simplejson/LICENSE.txt: Removed.
    * simplejson/README.txt: Removed.
    * simplejson/__init__.py: Removed.
    * simplejson/_speedups.c: Removed.
    * simplejson/decoder.py: Removed.
    * simplejson/encoder.py: Removed.
    * simplejson/jsonfilter.py: Removed.
    * simplejson/scanner.py: Removed.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55057 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c433059..e93ffda 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,30 @@
 
         Reviewed by Adam Barth.
 
+        Moved simplejson into webkitpy/thirdparty directory.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35196
+
+        * Scripts/run-chromium-webkit-tests:
+          - Added webkitpy/thirdparty to the script's search path.
+
+        * Scripts/webkitpy/thirdparty/simplejson: Copied from WebKitTools/simplejson.
+          - Copied simplejson directory.
+
+        * simplejson: Removed.
+        * simplejson/LICENSE.txt: Removed.
+        * simplejson/README.txt: Removed.
+        * simplejson/__init__.py: Removed.
+        * simplejson/_speedups.c: Removed.
+        * simplejson/decoder.py: Removed.
+        * simplejson/encoder.py: Removed.
+        * simplejson/jsonfilter.py: Removed.
+        * simplejson/scanner.py: Removed.
+
+2010-02-20  Chris Jerdonek  <cjerdonek at webkit.org>
+
+        Reviewed by Adam Barth.
+
         Moved BeautifulSoup to webkitpy/thirdparty directory.
 
         https://bugs.webkit.org/show_bug.cgi?id=35195
diff --git a/WebKitTools/Scripts/run-chromium-webkit-tests b/WebKitTools/Scripts/run-chromium-webkit-tests
index 221b5aa..60277c5 100755
--- a/WebKitTools/Scripts/run-chromium-webkit-tests
+++ b/WebKitTools/Scripts/run-chromium-webkit-tests
@@ -33,6 +33,8 @@ import sys
 
 sys.path.append(os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])),
                              "webkitpy", "layout_tests"))
+sys.path.append(os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])),
+                             "webkitpy", "thirdparty"))  # For simplejson.
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0]))))
 import run_chromium_webkit_tests
 
diff --git a/WebKitTools/simplejson/LICENSE.txt b/WebKitTools/Scripts/webkitpy/thirdparty/simplejson/LICENSE.txt
similarity index 100%
rename from WebKitTools/simplejson/LICENSE.txt
rename to WebKitTools/Scripts/webkitpy/thirdparty/simplejson/LICENSE.txt
diff --git a/WebKitTools/simplejson/README.txt b/WebKitTools/Scripts/webkitpy/thirdparty/simplejson/README.txt
similarity index 100%
rename from WebKitTools/simplejson/README.txt
rename to WebKitTools/Scripts/webkitpy/thirdparty/simplejson/README.txt
diff --git a/WebKitTools/simplejson/__init__.py b/WebKitTools/Scripts/webkitpy/thirdparty/simplejson/__init__.py
similarity index 100%
rename from WebKitTools/simplejson/__init__.py
rename to WebKitTools/Scripts/webkitpy/thirdparty/simplejson/__init__.py
diff --git a/WebKitTools/simplejson/_speedups.c b/WebKitTools/Scripts/webkitpy/thirdparty/simplejson/_speedups.c
similarity index 100%
rename from WebKitTools/simplejson/_speedups.c
rename to WebKitTools/Scripts/webkitpy/thirdparty/simplejson/_speedups.c
diff --git a/WebKitTools/simplejson/decoder.py b/WebKitTools/Scripts/webkitpy/thirdparty/simplejson/decoder.py
similarity index 100%
rename from WebKitTools/simplejson/decoder.py
rename to WebKitTools/Scripts/webkitpy/thirdparty/simplejson/decoder.py
diff --git a/WebKitTools/simplejson/encoder.py b/WebKitTools/Scripts/webkitpy/thirdparty/simplejson/encoder.py
similarity index 100%
rename from WebKitTools/simplejson/encoder.py
rename to WebKitTools/Scripts/webkitpy/thirdparty/simplejson/encoder.py
diff --git a/WebKitTools/simplejson/jsonfilter.py b/WebKitTools/Scripts/webkitpy/thirdparty/simplejson/jsonfilter.py
similarity index 100%
rename from WebKitTools/simplejson/jsonfilter.py
rename to WebKitTools/Scripts/webkitpy/thirdparty/simplejson/jsonfilter.py
diff --git a/WebKitTools/simplejson/scanner.py b/WebKitTools/Scripts/webkitpy/thirdparty/simplejson/scanner.py
similarity index 100%
rename from WebKitTools/simplejson/scanner.py
rename to WebKitTools/Scripts/webkitpy/thirdparty/simplejson/scanner.py

-- 
WebKit Debian packaging