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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit be60dafcd44231a71b65b65ac0bc43577835a4cc
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 20 21:44:21 2010 +0000

    2010-08-20  David Leong  <david.leong at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt] Update Symbian capabilities to remove AllFiles and DRM
    
            Add CONFIG(production) variation for set of DLL capabilities.
            DRM and AllFiles capabilities need to be audited for the sis
            package to be signed.
    
            No new tests.
    
            * WebCore.pro: Updated Symbian Capabilities.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65754 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b0d72fd..c2fee3c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-20  David Leong  <david.leong at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Update Symbian capabilities to remove AllFiles and DRM
+        
+        Add CONFIG(production) variation for set of DLL capabilities.
+        DRM and AllFiles capabilities need to be audited for the sis
+        package to be signed.
+        
+        No new tests.
+
+        * WebCore.pro: Updated Symbian Capabilities. 
+
 2010-08-20  Joseph Pecoraro  <joepeck at webkit.org>
 
         Reviewed by David Kilzer.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index a0e3556..e8cbe3a 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -8,7 +8,15 @@ meegotouch {
 
 symbian: {
     TARGET.EPOCALLOWDLLDATA=1
-    TARGET.CAPABILITY = All -Tcb
+    # DRM and Allfiles capabilites need to be audited to be signed on Symbian
+    # For regular users that is not possible, so use the CONFIG(production) flag is added
+    # To use all capabilies add CONFIG+=production
+    # If building from QT source tree, also add CONFIG-=QTDIR_build as qbase.pri defaults capabilities to All -Tcb.    
+    CONFIG(production) {
+        TARGET.CAPABILITY = All -Tcb
+    } else {
+        TARGET.CAPABILITY = All -Tcb -DRM -AllFiles
+    }
     isEmpty(QT_LIBINFIX) {
         TARGET.UID3 = 0x200267C2
     } else {

-- 
WebKit Debian packaging