Merge version 2.36.4-1~deb10u1+rpi1 and 2.36.6-1~deb10u1 to produce 2.36.6-1~deb10u1... archive/raspbian/2.36.6-1_deb10u1+rpi1 raspbian/2.36.6-1_deb10u1+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Thu, 25 Aug 2022 17:53:21 +0000 (18:53 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Thu, 25 Aug 2022 17:53:21 +0000 (18:53 +0100)
1  2 
debian/changelog
debian/rules

index 614127de62e8f7f10916259317058f1546f92e63,ab9107e6b5c50b96e2253f350e1abcf60ebafc92..5b668076c68696aeff01a2e5f9475db35199e44d
@@@ -1,12 -1,4 +1,12 @@@
- webkit2gtk (2.36.4-1~deb10u1+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.36.6-1~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>  Sun, 17 Jul 2022 18:38:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 25 Aug 2022 17:53:21 +0000
 +
- webkit2gtk (2.36.4-1~deb10u1) buster-security; urgency=high
+ webkit2gtk (2.36.6-1~deb10u1) buster-security; urgency=high
  
    * Rebuild for buster-security.
    * debian/patches/force-single-process.patch:
diff --cc debian/rules
Simple merge