[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 836d6a00a2b6dbc1ee11484afadc8efbacf1c08e
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 24 13:43:09 2010 +0000

    2010-02-23  Adam Roben  <aroben at apple.com>
    
            Make commit-log-editor find just-added ChangeLog files
    
            Fixes <http://webkit.org/b/35294> commit-log-editor doesn't find
            just-added ChangeLog files
    
            Reviewed by Dave Levin.
    
            * Scripts/commit-log-editor:
            (top level): Modified the regular expression that's used to find
            modified ChangeLog files to also look for just-added ChangeLog files.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55188 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3eab2a5..798645b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-23  Adam Roben  <aroben at apple.com>
+
+        Make commit-log-editor find just-added ChangeLog files
+
+        Fixes <http://webkit.org/b/35294> commit-log-editor doesn't find
+        just-added ChangeLog files
+
+        Reviewed by Dave Levin.
+
+        * Scripts/commit-log-editor:
+        (top level): Modified the regular expression that's used to find
+        modified ChangeLog files to also look for just-added ChangeLog files.
+
 2010-02-24  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/Scripts/commit-log-editor b/WebKitTools/Scripts/commit-log-editor
index 75017e3..88c6689 100755
--- a/WebKitTools/Scripts/commit-log-editor
+++ b/WebKitTools/Scripts/commit-log-editor
@@ -102,7 +102,7 @@ while (<LOG>) {
     }
     $existingLog = isGit() && !(/^#/ || /^\s*$/) unless $existingLog;
 
-    push @changeLogs, makeFilePathRelative($1) if $inChangesToBeCommitted && (/^M....(.*ChangeLog)\r?\n?$/ || /^#\tmodified:   (.*ChangeLog)/) && !/-ChangeLog/;
+    push @changeLogs, makeFilePathRelative($1) if $inChangesToBeCommitted && (/^(?:M|A)....(.*ChangeLog)\r?\n?$/ || /^#\t(?:modified|new file):   (.*ChangeLog)/) && !/-ChangeLog/;
 }
 close LOG;
 

-- 
WebKit Debian packaging