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

[yurys at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit c9ec29f404f51cf903b218c336d3a742c1b71f84
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 10 15:22:23 2010 +0000

    2010-02-10  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Chromium Win build fix. Add third_party/nss to the dependencies list on Windows.
    
            https://bugs.webkit.org/show_bug.cgi?id=34789
    
            * DEPS:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54598 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index c1fb4c5..23b2154 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Pavel Feldman.
 
+        Chromium Win build fix. Add third_party/nss to the dependencies list on Windows.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34789
+
+        * DEPS:
+
+2010-02-10  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
         Rolling Chromium dependencies to match Chromium revision 38580.
 
         https://bugs.webkit.org/show_bug.cgi?id=34789
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index adb7f96..9c45b83 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -50,6 +50,7 @@ vars = {
   'ffmpeg_ia32_rev': '34297',
   'pthreads-win32_rev': '26716',
   'python_24_rev': '22967',
+  'nss_rev': '36871',
 }
 
 deps = {
@@ -142,6 +143,10 @@ deps_os = {
 
     'third_party/pthreads-win32':
       Var('chromium_deps_svn')+'/pthreads-win32@'+Var('pthreads-win32_rev'),
+
+   # base.gypi depends on nss on Windows
+   'third_party/nss':
+      Var('chromium_deps_svn')+'/nss@'+Var('nss_rev'),
   },
   'unix': {
     # Linux, actually.

-- 
WebKit Debian packaging