From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 16 Nov 2023 12:11:59 +0000 (+0000)
Subject: Merge version 2.42.1-2+rpi1 and 2.42.2-1 to produce 2.42.2-1+rpi1
X-Git-Tag: archive/raspbian/2.42.2-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a19b075c1c3266454faece0e26ef7a5faebeed00;p=webkit2gtk.git

Merge version 2.42.1-2+rpi1 and 2.42.2-1 to produce 2.42.2-1+rpi1
---

a19b075c1c3266454faece0e26ef7a5faebeed00
diff --cc debian/changelog
index 5e1321a55f,60a1af9240..054f644fea
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,21 @@@
- webkit2gtk (2.42.1-2+rpi1) trixie-staging; urgency=medium
++webkit2gtk (2.42.2-1+rpi1) trixie-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)
 +
 +  [changes introuced in 2.40.0-3+rpi1 by Peter Michael Green]
 +  * Disable webgl on armhf.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 18 Oct 2023 21:19:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 16 Nov 2023 12:11:59 +0000
++
+ webkit2gtk (2.42.2-1) unstable; urgency=high
+ 
+   * New upstream release.
+   * debian/copyright:
+     - Update copyright information of all files.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Fri, 10 Nov 2023 19:02:00 +0100
  
  webkit2gtk (2.42.1-2) unstable; urgency=medium