Merge missing changes into git

diff --git a/debian/changelog b/debian/changelog
index f0e762509c62a24305253702f6ee37d5fafc46ba..635077e717ec4dd7555f7c86c3253c36204b4608 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,28 @@
-mathgl (2.4.4-2) UNRELEASED; urgency=medium
+mathgl (2.4.4-4) UNRELEASED; urgency=medium
+
+  [ Alastair McKinstry ]
+  * Switch from obsolete texlive-generic-recommended  to texlive-plain-generic
+    Closes: #941538
+  * Standard-Version: 4.4.1.0
+
+ -- Alastair McKinstry <mckinstry@debian.org>  Mon, 29 Jul 2019 19:13:56 +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) 
+  * 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
-  * Switch from obsolete texlive-generic-recommended  to texlive-plain-generic
-  * Standard-Version: 4.4.1.0
 
  -- Alastair McKinstry <mckinstry@debian.org>  Mon, 29 Jul 2019 19:13:56 +0100
 

diff --git a/debian/control b/debian/control
index 9585e7d579d1d5170bf57209bba4dce6b0b45a0a..7ab64aac42d87caf08f0c41de17643d91fb736ec 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: debhelper-compat (= 12),
  dh-python,
  python-numpy,
  qtwebengine5-dev [amd64 arm64 armhf i386 mipsel], 
- libwxgtk3.0-dev,
+ libwxgtk3.0-gtk3-dev,
  texinfo, 
  texlive, 
  texlive-plain-generic,