[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 28fec4de63f84e4c8b2903db0d4bff3b159648be
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 10 15:47:30 2010 +0000

    Make svn-create-patch and prepare-ChangeLog show better section headings for ObjC files
    
    This makes the text at the end of each "@@" line in a diff actually
    show the ObjC method or interface that contains the change, rather
    than whatever the most-recently-defined C function was.
    
    Fixes <http://webkit.org/b/35970>.
    
    Reviewed by John Sullivan.
    
    * Scripts/svn-create-patch: Pass -F'^[-+@]' to diff so that it will
    treat any lines starting with -, +, or @ as section heading lines.
    This works well for ObjC files, and shouldn't affect other types of
    files.
    
    * Scripts/prepare-ChangeLog: Changed the options passed to diff to
    match those used in svn-create-patch.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55780 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2b4163e..c9c78eb 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,24 @@
+2010-03-10  Adam Roben  <aroben at apple.com>
+
+        Make svn-create-patch and prepare-ChangeLog show better section
+        headings for ObjC files
+
+        This makes the text at the end of each "@@" line in a diff actually
+        show the ObjC method or interface that contains the change, rather
+        than whatever the most-recently-defined C function was.
+
+        Fixes <http://webkit.org/b/35970>.
+
+        Reviewed by John Sullivan.
+
+        * Scripts/svn-create-patch: Pass -F'^[-+@]' to diff so that it will
+        treat any lines starting with -, +, or @ as section heading lines.
+        This works well for ObjC files, and shouldn't affect other types of
+        files.
+
+        * Scripts/prepare-ChangeLog: Changed the options passed to diff to
+        match those used in svn-create-patch.
+
 2010-03-10  Simon Hausmann  <simon.hausmann at nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog
index 3350aa3..ae82cd2 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 -N $pathsString";
+        $command = "$SVN diff --diff-cmd diff -x -uaNpF'^[-+@]' $pathsString";
     } elsif ($isGit) {
         $command = "$GIT diff --no-ext-diff -U0 " . diffFromToString();
         $command .= " -- $pathsString" unless $gitCommit;
diff --git a/WebKitTools/Scripts/svn-create-patch b/WebKitTools/Scripts/svn-create-patch
index 768a8ed..2361cc5 100755
--- a/WebKitTools/Scripts/svn-create-patch
+++ b/WebKitTools/Scripts/svn-create-patch
@@ -203,7 +203,7 @@ sub generateDiff($$)
     if ($fileData->{modificationType} eq "additionWithHistory") {
         manufacturePatchForAdditionWithHistory($fileData);
     }
-    open DIFF, "svn diff --diff-cmd diff -x -uaNp '$file' |" or die;
+    open DIFF, "svn diff --diff-cmd diff -x -uaNpF'^[-+@]' '$file' |" or die;
     while (<DIFF>) {
         $patch .= $_;
     }

-- 
WebKit Debian packaging