Merge version 2.28.4-1+rpi1 and 2.30.1-1 to produce 2.30.1-1+rpi1

diff --cc debian/changelog
index 5c54d260f513d1e2df6c0fcad6ee1da93634234c,6f2af08766424249cc9d0c020e068165d50c2c91..cd5d5ecc7435b21d7d66ce644f0e0c225e2ee51c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,31 -1,45 +1,53 @@@
- webkit2gtk (2.28.4-1+rpi1) bullseye-staging; urgency=medium
++webkit2gtk (2.30.1-1+rpi1) bullseye-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, 01 Aug 2020 12:53:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 28 Sep 2020 05:09:27 +0000
 +
- webkit2gtk (2.28.4-1) unstable; urgency=high
+ webkit2gtk (2.30.1-1) unstable; urgency=medium
  
    * New upstream release.
-   * Enable OpenGL ES in arm:
-     + debian/patches/use-gles-on-arm.patch:
-       - Set ENABLE_GLES2_DEFAULT to ON on arm.
-     + debian/control:
-       - Always depend on libgl1-mesa-dev.
+   * debian/copyright:
+     + Update copyright information of all files.
+   * debian/gbp.conf:
+     + Update upstream branch name.
+   * debian/source/lintian-overrides:
+     + Remove mailing-list-obsolete-in-debian-infrastructure.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Mon, 21 Sep 2020 15:34:07 +0200
+ 
+ webkit2gtk (2.30.0-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * debian/watch:
+     + Scan stable releases only.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Fri, 11 Sep 2020 15:54:31 +0200
+ 
+ webkit2gtk (2.29.92-1) experimental; urgency=medium
+ 
+   * New upstream development release.
+ 
+  -- Alberto Garcia <berto@igalia.com>  Fri, 04 Sep 2020 17:10:45 +0200
+ 
+ webkit2gtk (2.29.91-1) experimental; urgency=medium
+ 
+   * New upstream development release (Closes: #967992).
+   * debian/copyright:
+     + Update copyright information of all files.
  
-  -- Alberto Garcia <berto@igalia.com>  Tue, 28 Jul 2020 17:12:20 +0200
+  -- Alberto Garcia <berto@igalia.com>  Fri, 14 Aug 2020 14:31:36 +0200
  
- webkit2gtk (2.28.3-2) unstable; urgency=high
+ webkit2gtk (2.29.4-1) experimental; urgency=medium
  
-   * The WebKitGTK security advisory WSA-2020-0006 lists the following
-     security fixes in the latest versions of WebKitGTK:
-     + CVE-2020-9802, CVE-2020-9803, CVE-2020-9805, CVE-2020-9806,
-       CVE-2020-9807, CVE-2020-9843, CVE-2020-9850, CVE-2020-13753 (fixed
-       in 2.28.3).
+   * New upstream development release.
+   * debian/control:
+     + Install libgl1-mesa-dev unconditionally. The decision of which gl
+       library to use is now taken directly by cmake.
    * Don't build the documentation in binary-arch builds and with the nodoc
-     build profile (Closes: #962616).
+     build profile.
      + debian/control:
        - Move gtk-doc-tools and *-doc to Build-Depends-Indep.
        - Add Build-Profiles: <!nodoc> to libwebkit2gtk-4.0-doc

diff --cc debian/rules
Simple merge