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

[darin at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 418bfed4733d96cb51030230284d18d206352d2c
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 25 21:07:59 2009 +0000

    * Scripts/prepare-ChangeLog: Leave files from the script-tests directory
    out, just as we do for the resources directory.
    
    Reviewed by Geoffrey Garen.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48768 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8f6a143..1d870e6 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-25  Darin Adler  <darin at apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        * Scripts/prepare-ChangeLog: Leave files from the script-tests directory
+        out, just as we do for the resources directory.
+
 2009-09-25  Adam Barth  <abarth at webkit.org>
 
         Unreviewed.  Added Tony to committers.py because he's a
diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog
index a422115..ed31005 100755
--- a/WebKitTools/Scripts/prepare-ChangeLog
+++ b/WebKitTools/Scripts/prepare-ChangeLog
@@ -1482,7 +1482,8 @@ sub generateFileList(\@\@\%)
                     if isAddedStatus($status)
                        && $file =~ /\.([a-zA-Z]+)$/
                        && $supportedTestExtensions{lc($1)}
-                       && !scalar(grep(/^resources$/i, @components));
+                       && !scalar(grep(/^resources$/i, @components))
+                       && !scalar(grep(/^script-tests$/i, @components));
             }
             push @{$changedFiles}, $file if $components[$#components] ne "ChangeLog";
         } elsif (isConflictStatus($status) || isConflictStatus($propertyStatus)) {

-- 
WebKit Debian packaging