Merge version 2.26.4-1~deb10u3+rpi1 and 2.28.2-2~deb10u1 to produce 2.28.2-2~deb10u1... archive/raspbian/2.28.2-2_deb10u1+rpi1 raspbian/2.28.2-2_deb10u1+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Sun, 10 May 2020 19:02:01 +0000 (20:02 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Sun, 10 May 2020 19:02:01 +0000 (20:02 +0100)
1  2 
debian/changelog
debian/rules

index 13990aa507f65119ddfe1ecf1dbb70005eec6c77,496c46bdc655d3e9d6bf798cd662839307175c8c..1c2d993e9db504ea42998e7d34fc85b5d3479954
@@@ -1,28 -1,6 +1,14 @@@
- webkit2gtk (2.26.4-1~deb10u3+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.28.2-2~deb10u1+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)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 18 Apr 2020 12:01:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 10 May 2020 19:02:00 +0000
 +
- webkit2gtk (2.26.4-1~deb10u3) buster-security; urgency=medium
+ webkit2gtk (2.28.2-2~deb10u1) buster-security; urgency=medium
  
-   * debian/patches/cve-2020-11793-fix.patch:
-     + Cherry-pick fix for CVE-2020-11793.
-  -- Alberto Garcia <berto@igalia.com>  Thu, 16 Apr 2020 18:37:24 +0200
- webkit2gtk (2.26.4-1~deb10u2) buster-security; urgency=medium
-   * debian/patches/cve-2020-10018-fix.patch:
-     + Cherry-pick fix for CVE-2020-10018.
-  -- Alberto Garcia <berto@igalia.com>  Mon, 16 Mar 2020 15:25:01 +0100
- webkit2gtk (2.26.4-1~deb10u1) buster-security; urgency=medium
-   * Rebuild for buster-backports.
+   * Rebuild for buster-security.
    * debian/patches/force-single-process.patch:
      + Force the single-process mode in Evolution and Geary
    * debian/control:
diff --cc debian/rules
Simple merge