Merge lp:~ari-tczew/webkit/lp-691104 into lp:~ubuntu-desktop/webkit/ubuntu

[Artur Rona]

[Robert Ancell (robert-ancell)]

This is now obsolete as we have 1.3.9 uploaded

Unmerged revisions

5. By Artur Rona on 2011-01-08

bzr add

4. By Artur Rona on 2011-01-08

Updated DEP3 tag.

3. By Artur Rona on 2011-01-08

[ Artur Rona ]
* Merge from debian unstable. Remaining changes: (LP: #691104)
  - debian/control: Drop Build-Depends on gir-repository-dev since
    we don't have this package in archive.
  - debian/patches/ubuntu-gir-version.patch: Use the 1.2 gobject
    introspection abi.
[ David Stansby ]
* debian/patches/typo_webkitwebsettings.patch: Fix typo. (LP: #552718)
[ Robert Ancell ]
* debian/control: Add Vcs-Bzr link related to Ubuntu Desktop Team.
* debian/patches/ubuntu-gir-version.patch:
  - Simplify patch to fix FTBFS
* debian/patches/ubuntu-gir-version.patch:
  - Change the alias definitions to work with the latest gobject-introspection
* New upstream release
* debian/patches/ubuntu-gir-version.patch:
  - Use the 1.2 gobject introspection abi
* Resync on Debian,
  remaining changes:
* debian/control:
  - don't build-depends on gir-repository-dev it's not required
* debian/patches/ubuntu-gir-version.patch:
  - use the current gobject introspection abi

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-22 06:30:12 +0000
+++ debian/changelog	2011-01-08 00:53:54 +0000
@@ -1,14 +1,19 @@
 webkit (1.2.5-2.1ubuntu1) UNRELEASED; urgency=low
 
-  * Merge with Debian unstable, remaining Ubuntu changes:
-  * debian/control:
-    - Don't build-depends on gir-repository-dev it's not required
-    - Use standards-version 3.9.1
-    - Add Vcs-Bzr link
-  * debian/patches/ubuntu-gir-version.patch:
-    - Use the current gobject introspection abi
-
- -- Robert Ancell <[e-mail]>  Wed, 22 Dec 2010 14:58:12 +1100
+  [ Artur Rona ]
+  * Merge from debian unstable.  Remaining changes: (LP: #691104)
+    - debian/control: Drop Build-Depends on gir-repository-dev since
+      we don't have this package in archive.
+    - debian/patches/ubuntu-gir-version.patch: Use the 1.2 gobject
+      introspection abi.
+
+  [ David Stansby ]
+  * debian/patches/typo_webkitwebsettings.patch: Fix typo. (LP: #552718)
+
+  [ Robert Ancell ]
+  * debian/control: Add Vcs-Bzr link related to Ubuntu Desktop Team.
+
+ -- Artur Rona <[e-mail]>  Sat, 08 Jan 2011 01:39:52 +0100
 
 webkit (1.2.5-2.1) unstable; urgency=low
 
@@ -48,6 +53,44 @@
 
  -- Gustavo Noronha Silva <[e-mail]>  Sat, 16 Oct 2010 17:50:56 -0300
 
+webkit (1.2.5-0ubuntu3) natty; urgency=low
+
+  * debian/patches/ubuntu-gir-version.patch:
+    - Simplify patch to fix FTBFS
+
+ -- Robert Ancell <[e-mail]>  Thu, 21 Oct 2010 13:40:42 +1100
+
+webkit (1.2.5-0ubuntu2) natty; urgency=low
+
+  * debian/patches/ubuntu-gir-version.patch:
+    - Change the alias definitions to work with the latest gobject-introspection
+
+ -- Robert Ancell <[e-mail]>  Tue, 19 Oct 2010 15:53:12 +1100
+
+webkit (1.2.5-0ubuntu1) natty; urgency=low
+
+  * New upstream release
+
+ -- Robert Ancell <[e-mail]>  Mon, 18 Oct 2010 20:17:09 +1100
+
+webkit (1.2.4-1ubuntu2) natty; urgency=low
+
+  * debian/patches/ubuntu-gir-version.patch:
+    - Use the 1.2 gobject introspection abi
+
+ -- Robert Ancell <[e-mail]>  Mon, 18 Oct 2010 14:03:26 +1100
+
+webkit (1.2.4-1ubuntu1) maverick; urgency=low
+
+  * Resync on Debian, 
+    remaining changes:
+  * debian/control:
+    - don't build-depends on gir-repository-dev it's not required
+  * debian/patches/ubuntu-gir-version.patch:
+    - use the current gobject introspection abi
+
+ -- Sebastien Bacher <[e-mail]>  Mon, 06 Sep 2010 16:48:11 +0200
+
 webkit (1.2.4-1) unstable; urgency=high
 
   * New stable release

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-12-22 06:30:12 +0000
+++ debian/patches/series	2011-01-08 00:53:54 +0000
@@ -7,3 +7,4 @@
 cve-2010-2901.patch
 cve-2010-3120.patch
 ubuntu-gir-version.patch
+typo_webkitwebsettings.patch

=== added file 'debian/patches/typo_webkitwebsettings.patch'
--- debian/patches/typo_webkitwebsettings.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/typo_webkitwebsettings.patch	2011-01-08 00:53:54 +0000
@@ -0,0 +1,18 @@
+From: Artur Rona <[e-mail]>
+Description: Fix typo in WebKit/gtk/webkit/webkitwebsettings.cpp.
+Bug-Ubuntu: https://launchpad.net/bugs/552718
+Origin: upstream, http://trac.webkit.org/changeset/64629/
+Author: David Stansby <[e-mail]>
+
+diff -pruN -x '*~' webkit-1.2.5.orig/WebKit/gtk/webkit/webkitwebsettings.cpp webkit-1.2.5/WebKit/gtk/webkit/webkitwebsettings.cpp
+--- webkit-1.2.5.orig/WebKit/gtk/webkit/webkitwebsettings.cpp	2010-12-16 13:31:40.000000000 +0100
++++ webkit-1.2.5/WebKit/gtk/webkit/webkitwebsettings.cpp	2010-12-16 15:42:22.000000000 +0100
+@@ -578,7 +578,7 @@ static void webkit_web_settings_class_in
+                                     PROP_ENABLE_XSS_AUDITOR,
+                                     g_param_spec_boolean("enable-xss-auditor",
+                                                          _("Enable XSS Auditor"),
+-                                                         _("Whether to enable teh XSS auditor"),
++                                                         _("Whether to enable the XSS auditor"),
+                                                          TRUE,
+                                                          flags));
+     /**

=== modified file 'debian/patches/ubuntu-gir-version.patch'
--- debian/patches/ubuntu-gir-version.patch	2010-12-22 03:53:43 +0000
+++ debian/patches/ubuntu-gir-version.patch	2011-01-08 00:53:54 +0000
@@ -1,3 +1,7 @@
+Description: Use the 1.2 gobject introspection abi.
+Forwarded: not-needed
+Author: Robert Ancell <[e-mail]>
+
 Index: webkit-1.2.5/WebKit/gtk/JSCore-1.0.gir
 ===================================================================
 --- webkit-1.2.5.orig/WebKit/gtk/JSCore-1.0.gir	2010-09-10 23:20:33.000000000 +1000