From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 27 May 2022 09:01:48 +0000 (+0100)
Subject: Merge version 2.36.0-3+rpi1 and 2.36.2-1 to produce 2.36.2-1+rpi1
X-Git-Tag: archive/raspbian/2.36.2-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6089a8b7cdadc41479bdc7196f991d419314633b;p=webkit2gtk.git

Merge version 2.36.0-3+rpi1 and 2.36.2-1 to produce 2.36.2-1+rpi1
---

6089a8b7cdadc41479bdc7196f991d419314633b
diff --cc debian/changelog
index 60712102bd,c3a36b4d1c..3762bbd8d5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,22 +1,30 @@@
- webkit2gtk (2.36.0-3+rpi1) bookworm-staging; urgency=medium
++webkit2gtk (2.36.2-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 25 Jan 2015 02:14:50 +0000]
 +  * Disable javascript JIT as it doesn't appear to be armv6 compatible
 +    (at least I assume that is the cause of the assembler errors)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 18 Apr 2022 05:05:48 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 27 May 2022 09:01:47 +0000
++
+ webkit2gtk (2.36.2-1) unstable; urgency=high
+ 
+   [ Alberto Garcia ]
+   * New upstream release.
+ 
+   [ Adrian Bunk ]
+   * debian/rules: lower memory requirements on sh4.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Wed, 18 May 2022 10:13:09 +0200
+ 
+ webkit2gtk (2.36.1-1) unstable; urgency=medium
+ 
+   [ Alberto Garcia ]
+   * New upstream release.
+ 
+   [ Jeremy Bicha ]
+   * Reduce the number of parallel build jobs on Ubuntu's amd64
+ 
+  -- Alberto Garcia <berto@igalia.com>  Thu, 21 Apr 2022 16:47:44 +0200
  
  webkit2gtk (2.36.0-3) unstable; urgency=medium