[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2f8a4035bfde05e82f551a1eeb73a3c944d50fda
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 10 19:22:06 2011 +0000

    2011-01-10  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Laszlo Gombos.
    
            [WINCE] Reenable NPAPI after r75203
            https://bugs.webkit.org/show_bug.cgi?id=52109
    
            Remove the !isWinCE() check for ENABLE_NETSCAPE_PLUGIN_API and replace
            it with !isEfl(), because EFL port does not support NPAPI (yet).
    
            * Scripts/build-webkit:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75396 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 409af28..686c4cf 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-10  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Laszlo Gombos.
+
+        [WINCE] Reenable NPAPI after r75203
+        https://bugs.webkit.org/show_bug.cgi?id=52109
+
+        Remove the !isWinCE() check for ENABLE_NETSCAPE_PLUGIN_API and replace
+        it with !isEfl(), because EFL port does not support NPAPI (yet).
+
+        * Scripts/build-webkit:
+
 2011-01-10  Adam Roben  <aroben at apple.com>
 
         Skip some asserting JS tests
diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index e188b10..e9de8cd 100755
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -198,7 +198,7 @@ my @features = (
       define => "ENABLE_METER_TAG", default => !isGtk() && !isAppleWinWebKit(), value => \$meterTagSupport },
 
     { option => "netscape-plugin", desc => "Netscape Plugin support",
-      define => "ENABLE_NETSCAPE_PLUGIN_API", default => !isWinCE(), value => \$netscapePluginSupport },
+      define => "ENABLE_NETSCAPE_PLUGIN_API", default => !isEfl(), value => \$netscapePluginSupport },
 
     { option => "notifications", desc => "Toggle Desktop Notifications Support",
       define => "ENABLE_NOTIFICATIONS", default => 0, value => \$notificationsSupport },

-- 
WebKit Debian packaging