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

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 404ca5dadc05ea5acb489023ddef715e622d85ee
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 13 09:18:21 2010 +0000

    [Qt/Symbian] Added missing vendor information to qtwebkit.sis
    
    Patch by Miikka Heikkinen <miikka.heikkinen at digia.com> on 2010-01-13
    Reviewed by Simon Hausmann.
    
    This information is necessary to Symbian sign the package.
    
    http://bugreports.qt.nokia.com/browse/QTBUG-7290
    
    * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53181 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7a7e26f..e466aef 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-13  Miikka Heikkinen <miikka.heikkinen at digia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt/Symbian] Added missing vendor information to qtwebkit.sis
+
+        This information is necessary to Symbian sign the package.
+
+        http://bugreports.qt.nokia.com/browse/QTBUG-7290
+
+        * WebCore.pro:
+
 2010-01-11  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index ac47f4d..a7d807a 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -9,6 +9,15 @@ symbian: {
 
     webkitlibs.sources = QtWebKit.dll
     webkitlibs.path = /sys/bin
+    vendorinfo = \
+        "; Localised Vendor name" \
+        "%{\"Nokia, Qt\"}" \
+        " " \
+        "; Unique Vendor name" \
+        ":\"Nokia, Qt\"" \
+        " "
+    webkitlibs.pkg_prerules = vendorinfo
+
     DEPLOYMENT += webkitlibs
 
     TARGET.UID3 = 0x200267C2

-- 
WebKit Debian packaging