[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 19e6a7d4d68ce6d70a5afe2285f450737eba6598
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 25 13:14:23 2010 +0000

    2010-01-25  Janne Koskinen  <janne.p.koskinen at digia.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Phone backup support for QtWebkit for Symbian devices.
            https://bugs.webkit.org/show_bug.cgi?id=34077
    
            * WebCore.pro:
    2010-01-25  Janne Koskinen  <janne.p.koskinen at digia.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Phone backup support for QtWebkit for Symbian devices.
            https://bugs.webkit.org/show_bug.cgi?id=34077
    
            * symbian/backup_registration.xml: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53799 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3c49245..ee5bc35 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-25  Janne Koskinen  <janne.p.koskinen at digia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Phone backup support for QtWebkit for Symbian devices.
+        https://bugs.webkit.org/show_bug.cgi?id=34077
+
+        * WebCore.pro:
+
 2010-01-25  Benjamin Poulain  <benjamin.poulain at nokia.com>
 
         Reviewed by Antti Koivisto.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 6a8dcbc..a5aadd0 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -6,6 +6,7 @@ symbian: {
     TARGET.EPOCALLOWDLLDATA=1
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 // Min 128kB, Max 32MB
     TARGET.CAPABILITY = All -Tcb
+    TARGET.UID3 = 0x200267C2
 
     webkitlibs.sources = QtWebKit.dll
     webkitlibs.path = /sys/bin
@@ -18,9 +19,11 @@ symbian: {
         " "
     webkitlibs.pkg_prerules = vendorinfo
 
-    DEPLOYMENT += webkitlibs
+    webkitbackup.sources = ../WebKit/qt/symbian/backup_registration.xml
+    webkitbackup.path = /private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,)
+
+    DEPLOYMENT += webkitlibs webkitbackup
 
-    TARGET.UID3 = 0x200267C2
     # Need to guarantee that these come before system includes of /epoc32/include
     MMP_RULES += "USERINCLUDE rendering"
     MMP_RULES += "USERINCLUDE platform/text"
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 6cca97c..1d9403e 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-25  Janne Koskinen  <janne.p.koskinen at digia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Phone backup support for QtWebkit for Symbian devices.
+        https://bugs.webkit.org/show_bug.cgi?id=34077
+
+        * symbian/backup_registration.xml: Added.
+
 2010-01-23  Girish Ramakrishnan  <girish at forwardbias.in>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/qt/symbian/backup_registration.xml b/WebKit/qt/symbian/backup_registration.xml
new file mode 100644
index 0000000..e026140
--- /dev/null
+++ b/WebKit/qt/symbian/backup_registration.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" standalone="yes"?>
+<backup_registration>
+    <system_backup/>
+    <restore requires_reboot = "no"/>
+</backup_registration>

-- 
WebKit Debian packaging