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

[ddkilzer at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 4a43f8287c2650b7ca5ce12eebac0d14b2ede3d4
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 04:06:27 2010 +0000

    <http://webkit.org/b/48224> build-webkit: add support for --meter-tag switch
    
    Reviewed by Csaba Osztrogonác.
    
    * Scripts/build-webkit: Added support for --meter-tag switch.
    It should have been added with r60820.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70606 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f96fd66..fe6274a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-26  David Kilzer  <ddkilzer at apple.com>
+
+        <http://webkit.org/b/48224> build-webkit: add support for --meter-tag switch
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Scripts/build-webkit: Added support for --meter-tag switch.
+        It should have been added with r60820.
+
 2010-10-26  Ademar de Souza Reis Jr.  <ademar.reis at openbossa.org>
 
         Reviewed by Dumitru Daniliuc.
diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index ce9ed75..70c7b98 100755
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -82,6 +82,7 @@ my (
     $javaScriptDebuggerSupport,
     $linkPrefetchSupport,
     $mathmlSupport,
+    $meterTagSupport,
     $notificationsSupport,
     $offlineWebApplicationSupport,
     $progressTagSupport,
@@ -181,6 +182,9 @@ my @features = (
     { option => "mathml", desc => "Toggle MathML support",
       define => "ENABLE_MATHML", default => 1, value => \$mathmlSupport },
 
+    { option => "meter-tag", desc => "Meter Tag support",
+      define => "ENABLE_METER_TAG", default => !isGtk() && !isAppleWinWebKit(), value => \$meterTagSupport },
+
     { option => "notifications", desc => "Toggle Desktop Notifications Support",
       define => "ENABLE_NOTIFICATIONS", default => 0, value => \$notificationsSupport },
 

-- 
WebKit Debian packaging