[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit d34c53c79d8be1f99b6143618e21ac87b5cc22a8
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 19 16:39:57 2010 +0000

    2010-07-19  Tony Chang  <tony at chromium.org>
    
            Reviewed by David Levin.
    
            fix chromium linux compile on ubuntu maverick
            https://bugs.webkit.org/show_bug.cgi?id=42528
    
            * Scripts/webkitdirs.pm: add a chomp to eat a newline that breaks the make command line
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63670 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e4156ed..fb39082 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-19  Tony Chang  <tony at chromium.org>
+
+        Reviewed by David Levin.
+
+        fix chromium linux compile on ubuntu maverick
+        https://bugs.webkit.org/show_bug.cgi?id=42528
+
+        * Scripts/webkitdirs.pm: add a chomp to eat a newline that breaks the make command line
+
 2010-07-19  Adam Roben  <aroben at apple.com>
 
         When dumping a response's MIME type, print its URL's last path
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 1bd0b59..d95f2a1 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -237,7 +237,7 @@ sub determineNumberOfCPUs
     if (isLinux()) {
         # First try the nproc utility, if it exists. If we get no
         # results fall back to just interpretting /proc directly.
-        $numberOfCPUs = `nproc 2> /dev/null`;
+        chomp($numberOfCPUs = `nproc 2> /dev/null`);
         if ($numberOfCPUs eq "") {
             $numberOfCPUs = (grep /processor/, `cat /proc/cpuinfo`);
         }

-- 
WebKit Debian packaging