diff -u webkit-1.1.15/debian/control webkit-1.1.15/debian/control
--- webkit-1.1.15/debian/control
+++ webkit-1.1.15/debian/control
@@ -1,7 +1,8 @@
 Source: webkit
 Priority: optional
 Section: web
-Maintainer: Debian WebKit Maintainers <pkg-webkit-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian WebKit Maintainers <pkg-webkit-maintainers@lists.alioth.debian.org>
 Uploaders: Mike Hommey <glandium@debian.org>, Gustavo Noronha Silva <kov@debian.org>
 Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.10), libpango1.0-dev (>= 1.16), libicu-dev, libxslt-dev, libsoup2.4-dev (>= 2.27.91), libsqlite3-dev, gperf, bison, flex, libjpeg62-dev, libpng12-dev, libxt-dev, autotools-dev, libgstreamer-plugins-base0.10-dev, libenchant-dev, gtk-doc-tools, libgail-dev
 Standards-Version: 3.8.1.0
diff -u webkit-1.1.15/debian/changelog webkit-1.1.15/debian/changelog
--- webkit-1.1.15/debian/changelog
+++ webkit-1.1.15/debian/changelog
@@ -1,15 +1,19 @@
-webkit (1.1.15-1) experimental; urgency=low
+webkit (1.1.15-1ubuntu1) karmic; urgency=low

-  * New upstream release
-  - includes fix for crash that will be fixed in 1.1.15.1
-  * debian/copyright:
-  - updated with changes since 1.1.14
-  * debian/libwebkit-1.0-2.symbols:
-  - updated
-  * debian/control:
-  - force same upstream version for -common
+  * Merge from debian experimental:
+    + New upstream release
+      - includes fix for crash that will be fixed in 1.1.15.1
+    + debian/copyright:
+     - updated with changes since 1.1.14
+    + debian/libwebkit-1.0-2.symbols:
+      - updated
+    + debian/control:
+      - force same upstream version for -common
+  * inline patch from Colin Watson:
+    + JavaScriptCore/wtf/Platform.h: Use JSVALUE64 on ia64 (see Debian
+      #547797).

- -- Gustavo Noronha Silva <kov@debian.org>  Mon, 21 Sep 2009 21:22:43 -0300
+ -- Didier Roche <didrocks@ubuntu.com>  Thu, 24 Sep 2009 09:32:21 +0200

 webkit (1.1.14-1) experimental; urgency=low

diff -u webkit-1.1.15/JavaScriptCore/wtf/Platform.h webkit-1.1.15/JavaScriptCore/wtf/Platform.h
--- webkit-1.1.15/JavaScriptCore/wtf/Platform.h
+++ webkit-1.1.15/JavaScriptCore/wtf/Platform.h
@@ -643,7 +643,7 @@
 #endif

 #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX))
+#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX)) || PLATFORM(IA64)
 #define WTF_USE_JSVALUE64 1
 #elif PLATFORM(ARM) || PLATFORM(PPC64)
 #define WTF_USE_JSVALUE32 1