[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.22-1-992-gfd6f826

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit ee56ee7ea68c17f4e964a45342ac845ba3ebb9d9
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Wed Mar 17 15:05:35 2010 -0300

    New upstream release that stars the preparation for the 1.2 stable branch

diff --git a/JavaScriptCore/wtf/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp
index aa7d192..e7d9efa 100644
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@ -2336,13 +2336,13 @@ static TCMalloc_Central_FreeListPadded central_cache[kNumClasses];
 
 // Page-level allocator
 static SpinLock pageheap_lock = SPINLOCK_INITIALIZER;
-static uint64_t pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(uint64_t) - 1) / sizeof(uint64_t)];
+static void* pageheap_memory[(sizeof(TCMalloc_PageHeap) + sizeof(void*) - 1) / sizeof(void*)];
 static bool phinited = false;
 
 // Avoid extra level of indirection by making "pageheap" be just an alias
 // of pageheap_memory.
 typedef union {
-    uint64_t* m_memory;
+    void* m_memory;
     TCMalloc_PageHeap* m_pageHeap;
 } PageHeapUnion;
 
diff --git a/debian/changelog b/debian/changelog
index 1e71fdd..efec015 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+webkit (1.1.90-1) unstable; urgency=low
+
+  * New upstream release
+  - This marks the preparation for the 1.2 stable branch
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Wed, 17 Mar 2010 15:05:11 -0300
+
 webkit (1.1.22-1) unstable; urgency=low
 
   * New upstream release

-- 
WebKit Debian packaging