Merge version 2.34.6-1+rpi1 and 2.36.0-3 to produce 2.36.0-3+rpi1

diff --cc debian/changelog
index 82fc92c7ce6776d62933adf9944aafdc23ccbb1e,e536f34b4f1664b53de91ed3bf17cc711bab2900..60712102bd7f3249b88efc397d6b87769c71c5f9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,64 +1,72 @@@
- webkit2gtk (2.34.6-1+rpi1) bookworm-staging; urgency=medium
++webkit2gtk (2.36.0-3+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>  Thu, 17 Mar 2022 16:48:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 18 Apr 2022 05:05:48 +0000
++
+ webkit2gtk (2.36.0-3) unstable; urgency=medium
+ 
+   * debian/rules:
+     - Build with -Os, -g0 and ggc-min-expand=10 in mips / mipsel in order
+       to lower the memory requirements and revert the changes from
+       2.36.0-2 (thanks, Adrian Bunk).
+ 
+  -- Alberto Garcia <berto@igalia.com>  Mon, 04 Apr 2022 12:58:57 +0200
+ 
+ webkit2gtk (2.36.0-2) unstable; urgency=medium
+ 
+   * debian/rules:
+     - Disable unified builds in Debian/mipsel and reduce the number of
+       parallel jobs in order to prevent running out of memory.
+   * debian/control:
+     - Clarify in package descriptions that 4.0 and 4.1 packages use
+       different versions of libsoup and that the documentation package is
+       equally valid for both.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Tue, 29 Mar 2022 23:06:22 +0200
+ 
+ webkit2gtk (2.36.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Refresh all patches.
+   * debian/rules:
+     + Build with CMAKE_BUILD_WITH_INSTALL_RPATH=ON, otherwise builds are
+       not reproducible if they happen in different directories.
+   * Bring all changes from the 2.35 (experimental) branch.
+   * debian/control:
+     + Make libjavascriptcoregtk-4.0-dev depend on libglib2.0-dev.
+   * debian/source/lintian-overrides:
+     + Update source-is-missing overrides.
+   * debian/libwebkit2gtk-4.0-37.symbols:
+     + Update symbols.
+   * debian/copyright:
+     + Update copyright information of all files.
+   * debian/gbp.conf:
+     + Update upstream branch name.
+   * debian/rules:
+     + USE_SYSTEMD was renamed to ENABLE_JOURNALD_LOG.
+   * debian/control:
+     + Remove all Conflicts: lines, they are obsolete.
+     + Make libjavascriptcoregtk-4.0-dev depend on libglib2.0-dev.
+     + Simplify descriptions and remove references to the WebKit2 API
+       layer.
+   * Build the 4.1 API version of the packages. These use libsoup 3 instead
+     of libsoup 2 but are otherwise identical to the 4.0 API packages.
+     + debian/control:
+       - Add build dependency on libsoup-3.0-dev.
+       - Add entries for the new packages. The 4.1 versions of the
+         WebDriver, JSC command-line interpreter and documentation are
+         currently not being generated.
+     + debian/rules:
+       - Add commands to build both sets of packages.
+     + debian/libwebkit2gtk-4.0-37.install:
+       - Update path of locale files to select only the exact API version.
+     + debian/not-installed:
+       - Don't install the 4.1 build of the JSC command-line interpreter.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Mon, 21 Mar 2022 23:10:15 +0100
  
  webkit2gtk (2.34.6-1) unstable; urgency=high
  

diff --cc debian/rules
Simple merge