Merge changes of the 2.4.4-6 debian release

diff --git a/debian/changelog b/debian/changelog
index 65a2c4f6f480f6dacb4fc92a01dce5b2dc643ec3..f50f343b5fc8d0481443af841b174391ec398578 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mathgl (2.4.4-6) unstable; urgency=medium
+
+  * Standards-Version: 4.5.0
+  * Use dh-sequence-python3 rather than --with python3
+  * Use swig rather than swig4.0. Closes: #952600
+
+ -- Alastair McKinstry <mckinstry@debian.org>  Thu, 27 Feb 2020 09:37:10 +0000
+
 mathgl (2.4.4-5) unstable; urgency=medium
 
   * Disable building of python2 module

diff --git a/debian/control b/debian/control
index 39ca608508662269c266d423f0ddf60d26d0606a..45ae2c04faddca7446b02b83bf5d256d76e92742 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.
 Uploaders: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>,
   Alastair McKinstry <mckinstry@debian.org>
 Build-Depends: debhelper-compat (= 12), 
+ dh-sequence-python3,
  libltdl-dev, 
  libgsl-dev, 
  freeglut3-dev,
@@ -17,7 +18,6 @@ Build-Depends: debhelper-compat (= 12),
  libfltk1.3-dev, 
  python3-dev, 
  python3-numpy, 
- dh-python,
  qtwebengine5-dev [amd64 arm64 armhf i386 mipsel], 
  libwxgtk3.0-gtk3-dev,
  texinfo, 
@@ -35,12 +35,12 @@ Build-Depends: debhelper-compat (= 12),
  libxi-dev, 
  libhpdf-dev,
  mpi-default-dev, 
- swig3.0, 
+ swig,
  cmake, 
  libxft-dev, 
  liboctave-dev,  
  fluid
-Standards-Version: 4.4.1.0
+Standards-Version: 4.5.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

diff --git a/debian/rules b/debian/rules
index 56b7879f730489b35f4d2a9179175c42a71e712b..61a83198e52998c0a60c51288fe0e81d5f5fef8e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ DOTTED:=`py3versions -d  |  sed 's/python//' `
 NODOT:=`py3versions -d | sed 's/\.//' | sed 's/python//' `
 
 %:
-       dh $@ --buildsystem=cmake --with python3
+       dh $@ --buildsystem=cmake 
 
 override_dh_auto_configure:
        dh_auto_configure -- \