Merge version 2.4.2.1-5+rpi1 and 2.4.4-4 to produce 2.4.4-4+rpi1

diff --cc debian/changelog
index ef1318a392cae01d61593345a1d0579457088420,539a663c1b71005377d4768778c814c3a745dc80..216af22b7cfa49eb3b3a1e82f8acc8683996fce1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,52 +1,59 @@@
- mathgl (2.4.2.1-5+rpi1) buster-staging; urgency=medium
++mathgl (2.4.4-4+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 2.4.2.1-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Dec 2018 02:34:35 +0000]
 +  * Don't use qtwebengine on armhf, we don't have it in raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 20 Dec 2018 02:34:35 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 09 Oct 2019 00:37:55 +0000
++
+ mathgl (2.4.4-4) unstable; urgency=medium
+ 
+   [ Alastair McKinstry ]
+   * Switch from obsolete texlive-generic-recommended  to texlive-plain-generic
+     Closes: #941538
+   * Filter format-security warnings which break autogenerated code
+   * Standard-Version: 4.4.1.0
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Wed, 02 Oct 2019 19:23:33 +0100
+ 
+ mathgl (2.4.4-3) unstable; urgency=medium
+ 
+   * Ack. previously fixed bugs. Closes: #696896, #908904
+   * Rebuild against wxWidgets GTK3. Closes: #933430
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Wed, 31 Jul 2019 10:21:43 +0100
+ 
+ mathgl (2.4.4-2) unstable; urgency=medium
+ 
+   [ Dimitrios Eftaxiopoulo ]
+   * Remove unused fix_hdf5.patch
+   * Remove d/compat file and use Build-Depends: debhelper-compat (= 12)
+     in d/control
+ 
+   [ Alastair McKinstry ]
+   * overide dh_dwz of mips, mipsel archs as it causes FTBFS
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Mon, 29 Jul 2019 19:13:56 +0100
+ 
+ mathgl (2.4.4-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Standards-Version: 4.4.0
+   * Still need to B-D on python-numpy. Why?
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Mon, 15 Jul 2019 08:49:05 +0100
+ 
+ mathgl (2.4.3-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Now use debhelper 12
+   * Enable OpenMP support. clang now supports this.
+     - drop pthread.patch
+   * Update VCS-* references to salsa.debian.org.
+   * Standards-Version: 4.3.0
+   * Simplify d/control Conflicts/Replaces, removing packages before oldstable
+   * Drop Python2 module
+ 
+  -- Alastair McKinstry <mckinstry@debian.org>  Tue, 25 Jun 2019 11:42:13 +0100
  
  mathgl (2.4.2.1-5) unstable; urgency=medium
  

diff --cc debian/control
index e7c1ea452c0a01e35eff3c356152eef077a1b232,7ab64aac42d87caf08f0c41de17643d91fb736ec..e495c643f0d0a3147cd160a0d3bcdd382dbb9019
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -4,16 -4,44 +4,44 @@@ Priority: optiona
  Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
  Uploaders: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>,
    Alastair McKinstry <mckinstry@debian.org>
- Build-Depends: debhelper (>= 11), libltdl-dev, libgsl-dev, freeglut3-dev,
-  libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-dev, libqt5opengl5-dev,
-  libjpeg-dev, libtiff-dev, libfltk1.3-dev, 
-  qtwebengine5-dev [amd64 arm64 i386 mipsel], libwxgtk3.0-dev,
-  texinfo, texlive, texlive-generic-recommended, liblua5.1-dev, libxcursor-dev,
-  libgif-dev, python3-dev, python3-numpy, libfontconfig1-dev, libqt5webkit5-dev,
-  libhdf4-dev, chrpath, libxinerama-dev, libxmu-dev, libxi-dev, libhpdf-dev,
-  mpi-default-dev, swig3.0, cmake, libxft-dev, liboctave-dev, fluid, python-dev,
-  python-numpy
- Standards-Version: 4.2.1.5
+ Build-Depends: debhelper-compat (= 12), 
+  libltdl-dev, 
+  libgsl-dev, 
+  freeglut3-dev,
+  libgl1-mesa-dev | libgl-dev, 
+  libpng-dev, 
+  libhdf5-dev, 
+  libqt5opengl5-dev,
+  libjpeg-dev, 
+  libtiff-dev, 
+  libfltk1.3-dev, 
+  python3-dev, 
+  python3-numpy, 
+  dh-python,
+  python-numpy,
 - qtwebengine5-dev [amd64 arm64 armhf i386 mipsel], 
++ qtwebengine5-dev [amd64 arm64 i386 mipsel],
+  libwxgtk3.0-gtk3-dev,
+  texinfo, 
+  texlive, 
+  texlive-plain-generic, 
+  liblua5.1-dev, 
+  libxcursor-dev,
+  libgif-dev, 
+  libfontconfig1-dev, 
+  libqt5webkit5-dev,
+  libhdf4-dev, 
+  chrpath, 
+  libxinerama-dev, 
+  libxmu-dev, 
+  libxi-dev, 
+  libhpdf-dev,
+  mpi-default-dev, 
+  swig3.0, 
+  cmake, 
+  libxft-dev, 
+  liboctave-dev,  
+  fluid
+ Standards-Version: 4.4.1.0
  Homepage: http://mathgl.sourceforge.net/doc_en/Main.html
  Vcs-Git: https://salsa.debian.org/science-team/mathgl.git
  Vcs-Browser: https://salsa.debian.org/science-team/mathgl