[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[mitz at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit e8d2ddc593db0f6fa16df2b0d787f5b809ad31bf
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 30 06:12:02 2009 +0000

    Fix “Undefined subroutine” errors in svn-*apply by moving the removeEOL subroutine
    from the two scripts that define it but don’t use it to the script that uses it but doesn’t
    define it.
    
    Reviewed by Mark Rowe.
    
    * Scripts/VCSUtils.pm:
    * Scripts/svn-apply:
    * Scripts/svn-unapply:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50318 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index aa99cb4..cb92f2c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-29  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Fix “Undefined subroutine” errors in svn-*apply by moving the removeEOL subroutine
+        from the two scripts that define it but don’t use it to the script that uses it but doesn’t
+        define it.
+
+        * Scripts/VCSUtils.pm:
+        * Scripts/svn-apply:
+        * Scripts/svn-unapply:
+
 2009-10-29  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Gustavo Noronha.
diff --git a/WebKitTools/Scripts/VCSUtils.pm b/WebKitTools/Scripts/VCSUtils.pm
index e1e0bc2..6d01f63 100644
--- a/WebKitTools/Scripts/VCSUtils.pm
+++ b/WebKitTools/Scripts/VCSUtils.pm
@@ -298,6 +298,14 @@ sub canonicalizePath($)
     return ($#dirs >= 0) ? File::Spec->catdir(@dirs) : ".";
 }
 
+sub removeEOL($)
+{
+    my ($line) = @_;
+
+    $line =~ s/[\r\n]+$//g;
+    return $line;
+}
+
 sub svnStatus($)
 {
     my ($fullPath) = @_;
diff --git a/WebKitTools/Scripts/svn-apply b/WebKitTools/Scripts/svn-apply
index 7d14e3a..4204625 100755
--- a/WebKitTools/Scripts/svn-apply
+++ b/WebKitTools/Scripts/svn-apply
@@ -79,7 +79,6 @@ sub isDirectoryEmptyForRemoval($);
 sub patch($);
 sub removeDirectoriesIfNeeded();
 sub setChangeLogDateAndReviewer($$);
-sub removeEOL($);
 
 # These should be replaced by an scm class/module:
 sub scmKnowsOfFile($);
@@ -378,14 +377,6 @@ sub setChangeLogDateAndReviewer($$)
     return $patch;
 }
 
-sub removeEOL($)
-{
-    my ($line) = @_;
-
-    $line =~ s/[\r\n]+$//g;
-    return $line;
-}
-
 # This could be made into a more general "status" call, except svn and git
 # have different ideas about "moving" files which might get confusing.
 sub scmWillDeleteFile($)
diff --git a/WebKitTools/Scripts/svn-unapply b/WebKitTools/Scripts/svn-unapply
index 94bb1ce..c277a3e 100755
--- a/WebKitTools/Scripts/svn-unapply
+++ b/WebKitTools/Scripts/svn-unapply
@@ -73,7 +73,6 @@ use VCSUtils;
 sub checksum($);
 sub patch($);
 sub revertDirectories();
-sub removeEOL($);
 sub unapplyPatch($$;$);
 sub unsetChangeLogDate($$);
 
@@ -259,14 +258,6 @@ sub revertDirectories()
     }
 }
 
-sub removeEOL($)
-{
-    my ($line) = @_;
-
-    $line =~ s/[\r\n]+$//g;
-    return $line;
-}
-
 sub unapplyPatch($$;$)
 {
     my ($patch, $fullPath, $options) = @_;

-- 
WebKit Debian packaging