[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 14e5b3fd178a1c8e5fc5653b3fb7bedf3462afd2
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 23 18:07:50 2003 +0000

    	Temporary hack to ensure that the layout tests will not all
    	be failures if/when the layout tests regression gets fixed.
    	Will remove once we can run the tests.
    
            Reviewed by ken
    
            * khtml/rendering/render_block.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4691 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 2351c67..d71c190 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-07-23  Dave Hyatt  <hyatt at apple.com>
+
+	Temporary hack to ensure that the layout tests will not all
+	be failures if/when the layout tests regression gets fixed.
+	Will remove once we can run the tests.
+	
+        Reviewed by ken
+
+        * khtml/rendering/render_block.cpp:
+
 2003-07-22  Dave Hyatt  <hyatt at apple.com>
 
 	Allow HTML and BODY to be any display type.  This patch primarily eliminates the
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2351c67..d71c190 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-07-23  Dave Hyatt  <hyatt at apple.com>
+
+	Temporary hack to ensure that the layout tests will not all
+	be failures if/when the layout tests regression gets fixed.
+	Will remove once we can run the tests.
+	
+        Reviewed by ken
+
+        * khtml/rendering/render_block.cpp:
+
 2003-07-22  Dave Hyatt  <hyatt at apple.com>
 
 	Allow HTML and BODY to be any display type.  This patch primarily eliminates the
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 6ec6c8e..5234c38 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -2310,6 +2310,9 @@ InlineFlowBox* RenderBlock::getFirstLineBox()
 
 const char *RenderBlock::renderName() const
 {
+    if (isBody())
+        return "RenderBody"; // FIXME: Temporary hack until we know that the regression tests pass.
+    
     if (isFloating())
         return "RenderBlock (floating)";
     if (isPositioned())

-- 
WebKit Debian packaging