Merge version 2.34.0-1+rpi1 and 2.34.1-1 to produce 2.34.1-1+rpi1 archive/raspbian/2.34.1-1+rpi1 raspbian/2.34.1-1+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Tue, 26 Oct 2021 20:18:13 +0000 (21:18 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Tue, 26 Oct 2021 20:18:13 +0000 (21:18 +0100)
1  2 
debian/changelog
debian/rules

index 77b9e07d1f007a520760e222b94b0b4b36d02c67,455d9feda895127b1b37c516b2edf3a1e2dc9505..1585bf6cedad615ec8187b3faaa70e81e3993ed6
@@@ -1,10 -1,26 +1,34 @@@
- webkit2gtk (2.34.0-1+rpi1) bookworm-staging; urgency=medium
++webkit2gtk (2.34.1-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>  Tue, 28 Sep 2021 17:31:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 26 Oct 2021 20:18:12 +0000
++
+ webkit2gtk (2.34.1-1) unstable; urgency=high
+   [ Alberto Garcia ]
+   * New upstream release.
+   * debian/rules:
+     + Build with -O1 in sh3 and sh4 (Closes: #995717).
+   * debian/copyright:
+     + Update copyright information of all files.
+   * debian/libwebkit2gtk-4.0-37.symbols:
+     + Update symbols.
+   * debian/libwebkit2gtk-4.0-37.lintian-overrides:
+     + Override library-not-linked-against-libc.
+   * debian/source/lintian-overrides:
+     + Update source-is-missing overrides.
+   * debian/control:
+     + Update Standards-Version to 4.6.0.1 (no changes).
+   [ Sebastien Bacher ]
+   * debian/control, debian/rules:
+     + handle gstreamer1.0-plugins-bad with the same Ubuntu override than
+       libav, it's also in universe (Closes: #995166).
+  -- Alberto Garcia <berto@igalia.com>  Fri, 22 Oct 2021 00:56:49 +0200
  
  webkit2gtk (2.34.0-1) unstable; urgency=medium
  
diff --cc debian/rules
Simple merge