Merge version 2.4.4-6+rpi1 and 2.4.4-7 to produce 2.4.4-7+rpi1

diff --cc debian/changelog
index 12e725057664635ccdb2d48df39103e9fbbfb3ce,ebcec069a9f0bb2ee7d5d22016329c0234ae5924..c635a689fee1ea3b2a4a9e492c8fa4ff791eae28
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,21 @@@
- mathgl (2.4.4-6+rpi1) bullseye-staging; urgency=medium
++mathgl (2.4.4-7+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 27 Feb 2020 16:35:03 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Dec 2020 20:33:07 +0000
++
+ mathgl (2.4.4-7) experimental; urgency=medium
+ 
+   * Team upload
+   * Disable building of the SWIG binding for Octave (Closes: #976381)
+   * Bump Standards-Version to 4.5.1 (no changes needed)
+   * Add Rules-Requires-Root: no
+   * Fix wildcard matches in copyright file
+   * Add DEP3 headers to the Debian patches
+   * Bump version of watch file to 4
+ 
+  -- Rafael Laboissière <rafael@debian.org>  Sun, 06 Dec 2020 05:37:53 -0300
  
  mathgl (2.4.4-6) unstable; urgency=medium
  

diff --cc debian/control
index f67fb32c6cf74063948da5f0d1b11cd9156ae122,cdc828a56f4b7f1cd5af3b75d49cbcae2d44d10b..e678b6563d77026ef9d78967ad00d6e1be3780b8
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -4,43 -4,42 +4,42 @@@ 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-compat (= 12), 
+ Build-Depends: debhelper-compat (= 12),
   dh-sequence-python3,
-  libltdl-dev, 
-  libgsl-dev, 
+  libltdl-dev,
+  libgsl-dev,
   freeglut3-dev,
-  libgl1-mesa-dev | libgl-dev, 
-  libpng-dev, 
-  libhdf5-dev, 
+  libgl1-mesa-dev | libgl-dev,
+  libpng-dev,
+  libhdf5-dev,
   libqt5opengl5-dev,
-  libjpeg-dev, 
-  libtiff-dev, 
-  libfltk1.3-dev, 
-  python3-dev, 
-  python3-numpy, 
+  libjpeg-dev,
+  libtiff-dev,
+  libfltk1.3-dev,
+  python3-dev,
+  python3-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, 
+  texinfo,
+  texlive,
+  texlive-plain-generic,
+  liblua5.1-dev,
   libxcursor-dev,
-  libgif-dev, 
-  libfontconfig1-dev, 
+  libgif-dev,
+  libfontconfig1-dev,
   libqt5webkit5-dev,
-  libhdf4-dev, 
-  chrpath, 
-  libxinerama-dev, 
-  libxmu-dev, 
-  libxi-dev, 
+  libhdf4-dev,
+  chrpath,
+  libxinerama-dev,
+  libxmu-dev,
+  libxi-dev,
   libhpdf-dev,
-  mpi-default-dev, 
+  mpi-default-dev,
   swig,
-  cmake, 
-  libxft-dev, 
-  liboctave-dev,  
+  cmake,
+  libxft-dev,
   fluid
- Standards-Version: 4.5.0
+ Standards-Version: 4.5.1
  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