Merge version 5.7+dfsg-6+rpi1 and 5.9+dfsg-2 to produce 5.9+dfsg-2+rpi1

diff --cc debian/changelog
index c38bd1df613db28c98087f92239f607e3a8071ff,17dbc9ff43dba9f07e4712d86f1a7ba648ecee86..01f8916d314d83b58e42344c26195ac2b8c8c50c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,46 +1,54 @@@
- pyqt5 (5.7+dfsg-6+rpi1) buster-staging; urgency=medium
++pyqt5 (5.9+dfsg-2+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 5.7+dfsg-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 09 Sep 2017 01:01:09 +0000]
 +  * Disable webengine for armhf, we do not currently have (and may never have)
 +    it in Raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 09 Sep 2017 01:01:09 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 30 Sep 2017 12:38:48 +0000
++
+ pyqt5 (5.9+dfsg-2) unstable; urgency=medium
+ 
+   * Backport upstream patch to fix handling of disabled features (fixes
+     build on architectures with OpenGL ES).
+   * Enable Qt WebEngine support on mipsel.
+   * Drop Breaks/Replaces on versions that are not even in oldstable.
+   * Bump Standards-Version to 4.1.0, stop using deprecated Priority: extra.
+   * Upload to unstable.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sat, 23 Sep 2017 22:18:04 +0300
+ 
+ pyqt5 (5.9+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Upstream no longer ships Sphinx documentation in this source.
+     - Stop building pyqt5-doc package.
+     - Update debian/copyright to not exclude doc/html from the tarball.
+     - Drop python3-sphinx build-dependency.
+   * Bump sip build-dependencies to 4.19.3, following configure.py.
+   * Remove unused variables from debian/rules.
+   * Build against Qt 5.9.1 in experimental.
+   * Copy config-tests directory to build directories before configure.
+   * Add explicit build-dependency on libjs-jquery.
+   * Enable Qt WebEngine support on arm64 and armhf (closes: #867733).
+   * Bump Standards-Version to 4.0.0, no changes needed.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 18 Jul 2017 11:30:02 +0300
+ 
+ pyqt5 (5.8.2+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Update debian/copyright.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Tue, 09 May 2017 10:25:24 +0300
+ 
+ pyqt5 (5.8.1+dfsg-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Drop bytes_conversion.diff, applied in the new release.
+   * Drop no_qml_debug.diff, applied in the new release.
+   * Bump sip build-dependencies to 4.19.1, following configure.py.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 13 Mar 2017 17:51:47 +0300
  
  pyqt5 (5.7+dfsg-6) unstable; urgency=medium
  

diff --cc debian/control
index b5e968940f875f0fb8012ec53424f3590f73f004,b18277f38a62642cb2386fd134580393ba8185c2..a3447042a81f31cbc28a6f93a510b2b391c7bdb5
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -42,11 -43,11 +43,11 @@@ Build-Depends: debhelper (>= 9)
                 qtmultimedia5-dev (>= 5.9.1),
                 qtpositioning5-dev (>= 5.9.1),
                 qttools5-dev (>= 5.9.1),
 -               qtwebengine5-dev (>= 5.9.1) [amd64 arm64 armhf i386 mipsel]
 +               qtwebengine5-dev (>= 5.9.1) [amd64 arm64 i386 mipsel]
- Build-Depends-Indep: fdupes, python3-sphinx (>= 1.3)
+ Build-Depends-Indep: fdupes
  X-Python-Version: >= 2.7
  X-Python3-Version: >= 3.3
- Standards-Version: 3.9.8
+ Standards-Version: 4.1.0
  Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/
  Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/pyqt5.git
  Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/pyqt5.git
@@@ -258,9 -242,8 +242,8 @@@ Description: Python 3 bindings for Qt5'
   This package contains the Python 3 version of this module.
  
  Package: python3-pyqt5.qtwebengine-dbg
- Priority: extra
  Section: debug
 -Architecture: amd64 arm64 armhf i386 mipsel
 +Architecture: amd64 arm64 i386 mipsel
  Depends: python3-dbg,
           python3-pyqt5.qtwebchannel-dbg (= ${binary:Version}),
           python3-pyqt5.qtwebengine (= ${binary:Version}),
@@@ -700,9 -666,8 +666,8 @@@ Description: Python 2 bindings for Qt5'
   This package contains the Python 2 version of this module.
  
  Package: python-pyqt5.qtwebengine-dbg
- Priority: extra
  Section: debug
 -Architecture: amd64 arm64 armhf i386 mipsel
 +Architecture: amd64 arm64 i386 mipsel
  Depends: python-dbg,
           python-pyqt5.qtwebchannel-dbg (= ${binary:Version}),
           python-pyqt5.qtwebengine (= ${binary:Version}),

diff --cc debian/rules
Simple merge