[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[aroben at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 5fbae3bd89e2b0a60bacd3123dd03e6c4309f549
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 10 22:19:15 2010 +0000

    Roll out the prepare-ChangeLog part of r55870
    
    This change wasn't needed (prepare-ChangeLog calls svn-create-patch
    when it's asked to print out diffs for the user) and was screwing up
    its ability to find changed function names.
    
    * Scripts/prepare-ChangeLog:
    (diffCommand): Change the options we pass to svn-diff back to their
    pre-r55870 form.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55807 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b2d5932..615947f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-10  Adam Roben  <aroben at apple.com>
+
+        Roll out the prepare-ChangeLog part of r55870
+
+        This change wasn't needed (prepare-ChangeLog calls svn-create-patch
+        when it's asked to print out diffs for the user) and was screwing up
+        its ability to find changed function names.
+
+        * Scripts/prepare-ChangeLog:
+        (diffCommand): Change the options we pass to svn-diff back to their
+        pre-r55870 form.
+
 2010-03-10  Robert Hogan  <robert at webkit.org>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog
index ae82cd2..3350aa3 100755
--- a/WebKitTools/Scripts/prepare-ChangeLog
+++ b/WebKitTools/Scripts/prepare-ChangeLog
@@ -1227,7 +1227,7 @@ sub diffCommand(@)
 
     my $command;
     if ($isSVN) {
-        $command = "$SVN diff --diff-cmd diff -x -uaNpF'^[-+@]' $pathsString";
+        $command = "$SVN diff --diff-cmd diff -x -N $pathsString";
     } elsif ($isGit) {
         $command = "$GIT diff --no-ext-diff -U0 " . diffFromToString();
         $command .= " -- $pathsString" unless $gitCommit;

-- 
WebKit Debian packaging