[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 8889ff71253119ad06389e3817ce5d897e37a7d3
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 23:12:21 2010 +0000

    2010-10-14  Andreas Kling  <kling at webkit.org>
    
            Soup buildfix for r69808: add ProxyServer stub.
    
            * GNUmakefile.am:
            * platform/network/soup/ProxyServerSoup.cpp: Added.
            (WebCore::proxyServersForURL):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69817 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4a6cb43..391d4b7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2010-10-14  Andreas Kling  <kling at webkit.org>
 
+        Soup buildfix for r69808: add ProxyServer stub.
+
+        * GNUmakefile.am:
+        * platform/network/soup/ProxyServerSoup.cpp: Added.
+        (WebCore::proxyServersForURL):
+
+2010-10-14  Andreas Kling  <kling at webkit.org>
+
         Fix GTK+ build after r69808.
 
         * GNUmakefile.am:
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 58ada25..94084ca 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -3576,6 +3576,7 @@ webcoregtk_sources += \
 	WebCore/platform/network/soup/CookieJarSoup.h \
 	WebCore/platform/network/soup/GOwnPtrSoup.cpp \
 	WebCore/platform/network/soup/GOwnPtrSoup.h \
+	WebCore/platform/network/soup/ProxyServerSoup.cpp \
 	WebCore/platform/network/soup/ResourceError.h \
 	WebCore/platform/network/soup/ResourceHandleSoup.cpp \
 	WebCore/platform/network/soup/ResourceRequest.h \
diff --git a/WebCore/platform/network/curl/ProxyServerCurl.cpp b/WebCore/platform/network/soup/ProxyServerSoup.cpp
similarity index 100%
copy from WebCore/platform/network/curl/ProxyServerCurl.cpp
copy to WebCore/platform/network/soup/ProxyServerSoup.cpp

-- 
WebKit Debian packaging