From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 5 Dec 2019 22:43:17 +0000 (+0000)
Subject: Merge version 2.26.2-1~deb10+1+rpi1 and 2.26.2-1 to produce 2.26.2-1+rpi1
X-Git-Tag: archive/raspbian/2.26.2-1+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8560f9b7c7e5a3f6ec7e4fcec7f3dc3e7ee96ec6;p=webkit2gtk.git

Merge version 2.26.2-1~deb10+1+rpi1 and 2.26.2-1 to produce 2.26.2-1+rpi1
---

8560f9b7c7e5a3f6ec7e4fcec7f3dc3e7ee96ec6
diff --cc debian/changelog
index a961c78c59,43fb9c9848..c430128253
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,3 +1,26 @@@
- webkit2gtk (2.26.2-1~deb10+1+rpi1) buster-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)
- 
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 17 Nov 2019 09:03:35 +0000
- 
- webkit2gtk (2.26.2-1~deb10+1) buster-security; urgency=high
++webkit2gtk (2.26.2-1+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 2.26.2-1~deb10+1 by Alberto Garcia <berto@igalia.com> at Tue, 12 Nov 2019 14:15:29 +0200]
 +  * Rebuild for buster-security.
 +  * debian/patches/force-single-process.patch:
 +    + Force the single-process mode in Evolution and Geary
 +  * debian/control:
 +    + Remove Breaks for Evolution < 3.34.1.
 +  * The WebKitGTK security advisory WSA-2019-0006 lists the following
 +    security fixes in the latest versions of WebKitGTK:
 +    + CVE-2019-8765, CVE-2019-8821, CVE-2019-8822 (fixed in 2.24.4)
 +    + CVE-2019-8710, CVE-2019-8743, CVE-2019-8764, CVE-2019-8766,
 +      CVE-2019-8782, CVE-2019-8808, CVE-2019-8815 (fixed in 2.26.0)
 +    + CVE-2019-8783, CVE-2019-8811, CVE-2019-8813, CVE-2019-8816,
 +      CVE-2019-8819, CVE-2019-8820, CVE-2019-8823 (fixed in 2.26.1)
 +    + CVE-2019-8812, CVE-2019-8814 (fixed in 2.26.2)
 +
-  -- Alberto Garcia <berto@igalia.com>  Tue, 12 Nov 2019 14:15:29 +0200
++  [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>  Thu, 05 Dec 2019 22:43:17 +0000
 +
  webkit2gtk (2.26.2-1) unstable; urgency=medium
  
    * New upstream release.