[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[hamaji at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2088d7cacfd22672be9fd9ee5375d0e2d5e13618
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 7 16:23:43 2009 +0000

    2009-10-06  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Reviewed by Jan Alonzo.
    
            [Layout tests] [Gtk] Gtk DumpRenderTree should use WebKit test fonts
            https://bugs.webkit.org/show_bug.cgi?id=29689
    
            Build fix by adding -lfontconfig for DumpRenderTree.
    
            * GNUmakefile.am:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49246 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 096c85d..c27386b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-06  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Reviewed by Jan Alonzo.
+
+        [Layout tests] [Gtk] Gtk DumpRenderTree should use WebKit test fonts
+        https://bugs.webkit.org/show_bug.cgi?id=29689
+
+        Build fix by adding -lfontconfig for DumpRenderTree.
+
+        * GNUmakefile.am:
+
 2009-10-07  Csaba Osztrogonac  <oszi at inf.u-szeged.hu>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKitTools/GNUmakefile.am b/WebKitTools/GNUmakefile.am
index 6cd8afa..c2029f3 100644
--- a/WebKitTools/GNUmakefile.am
+++ b/WebKitTools/GNUmakefile.am
@@ -87,7 +87,8 @@ Programs_DumpRenderTree_LDADD = \
 	$(CAIRO_LIBS) \
 	$(GTK_LIBS) \
 	$(GLIB_LIBS) \
-	$(LIBSOUP_LIBS)
+	$(LIBSOUP_LIBS) \
+	$(FREETYPE_LIBS)
 
 Programs_DumpRenderTree_LDFLAGS = \
 	-no-fast-install \

-- 
WebKit Debian packaging