Manual merge of version 2.4.4-7+rpi1 and 2.5-2 to produce 2.5-2+rpi1

diff --cc debian/changelog
index c635a689fee1ea3b2a4a9e492c8fa4ff791eae28,1d8d2cfe218a7c3c20c2497d8dc7c0e6eb70db83..3e09525837415dbb6c226cba05b1331902017a59
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,51 +1,58 @@@
- mathgl (2.4.4-7+rpi1) bullseye-staging; urgency=medium
++mathgl (2.5-2+rpi1) bookworm-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>  Fri, 18 Dec 2020 20:33:07 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 11 Jan 2022 03:25:12 +0000
 +
- mathgl (2.4.4-7) experimental; urgency=medium
+ mathgl (2.5-2) unstable; urgency=medium
+ 
+   * Team upload
+   * Upload to unstable
+ 
+  -- Rafael Laboissière <rafael@debian.org>  Fri, 24 Dec 2021 13:17:49 -0300
+ 
+ mathgl (2.5-1) experimental; urgency=medium
+ 
+   * Team upload
+ 
+   * Upload to experimental, due to the bump in the SOVERSION of the
+     libraries and the name of the packages.
+ 
+   * New upstream version 2.5
+   * d/p/python3.patch: Drop patch (applied upstream)
+   * d/control:
+     + Adjust package names for new upstream SOVERSION
+     + Tighten dependency on libmgl-data to the current source:Version
+     + Bump Standards-Version to 4.6.0 (no changes needed)
+     + Bump to debhelper compatibility level 13
+     + Build-depend on desktop-file-utils
+   * Adjust the names of the d/lib*.install files for new upstream SOVERSION
+   * New scheme for enabling cmake modules
+     + d/p/CMakeLists.patch: Drop patch
+     + d/rules: Activate the modules through -D options to dh_auto_configure
+   * New upstream installation path for Python files
+     + d/python3-mathgl.install: Adjust for new upstream layout
+     + d/not-installed: Ignore the .pyc file
+   * d/mathgl.install: Include mgllab.desktop
+   * d/udav.install: Fix location of udav.desktop
+   * d/u/metadata: New file
+   * d/rules: Drop dependency on libmgl-data for secondary libraries.
+     All libmgl-*<soversion> libraries depend on the main library
+     libmgl<soversion>, which depends on libmgl-data.
+   * d/libmgl-data.install: Install the gettext (*.mo) files
+   * d/libmgl-dev.install: Install the *.cmake files
+   * d/libmgl-dev.examples: Install the examples
+ 
+  -- Rafael Laboissière <rafael@debian.org>  Sat, 18 Dec 2021 05:01:32 -0300
+ 
+ mathgl (2.4.4-7) unstable; urgency=medium
+ 
+   * Upload to unstable
+ 
+  -- Rafael Laboissière <rafael@debian.org>  Wed, 09 Dec 2020 16:03:25 -0300
+ 
+ mathgl (2.4.4-7~exp) experimental; urgency=medium
  
    * Team upload
    * Disable building of the SWIG binding for Octave (Closes: #976381)

diff --cc debian/control
index e678b6563d77026ef9d78967ad00d6e1be3780b8,5267c9fe7fdff274e5e766cafbf8e722e31f6a59..f65e5880dca979a60cf332a15df454032768cc67
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -4,42 -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-compat (= 12),
+ Build-Depends:
+  chrpath,
+  cmake,
+  debhelper-compat (= 13),
+  desktop-file-utils,
   dh-sequence-python3,
-  libltdl-dev,
-  libgsl-dev,
+  fluid,
   freeglut3-dev,
+  libfltk1.3-dev,
+  libfontconfig1-dev,
+  libgif-dev,
   libgl1-mesa-dev | libgl-dev,
-  libpng-dev,
+  libgsl-dev,
+  libhdf4-dev,
   libhdf5-dev,
-  libqt5opengl5-dev,
+  libhpdf-dev,
   libjpeg-dev,
+  libltdl-dev,
+  liblua5.1-dev,
+  libpng-dev,
+  libqt5opengl5-dev,
+  libqt5webkit5-dev,
   libtiff-dev,
-  libfltk1.3-dev,
-  python3-dev,
-  python3-numpy,
-  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,
+  libxft-dev,
+  libxi-dev,
   libxinerama-dev,
   libxmu-dev,
-  libxi-dev,
-  libhpdf-dev,
   mpi-default-dev,
 - qtwebengine5-dev [amd64 arm64 armhf i386 mipsel],
+  python3-dev,
+  python3-numpy,
++ qtwebengine5-dev [amd64 arm64 i386 mipsel],
   swig,
-  cmake,
-  libxft-dev,
-  fluid
- Standards-Version: 4.5.1
+  texinfo,
+  texlive,
+  texlive-plain-generic
+ Standards-Version: 4.6.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