Update debian dir from mathgl_2.4.4-4.debian.tar.xz

diff --git a/debian/changelog b/debian/changelog
index e72df472777adb5d8c813dcf689e3d00ef2d9483..539a663c1b71005377d4768778c814c3a745dc80 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,31 @@
-mathgl (2.4.4-2) UNRELEASED; urgency=medium
+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) 
+  * 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
 
- -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Sun, 28 Jul 2019 11:32:06 +0300
+ -- Alastair McKinstry <mckinstry@debian.org>  Mon, 29 Jul 2019 19:13:56 +0100
 
 mathgl (2.4.4-1) unstable; urgency=medium
 

diff --git a/debian/control b/debian/control
index 96c7944447ad86ef646473fbb6fd7542cd67edb3..7ab64aac42d87caf08f0c41de17643d91fb736ec 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,17 +4,44 @@ Priority: optional
 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), 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,
+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], libwxgtk3.0-dev,
- texinfo, texlive, texlive-generic-recommended, 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.0
+ qtwebengine5-dev [amd64 arm64 armhf 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

diff --git a/debian/rules b/debian/rules
index 6163941c601617810e0e38b5853705ec7c16e79a..56b7879f730489b35f4d2a9179175c42a71e712b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,8 @@
 export DH_VERBOSE=1
 export DH_OPTIONS=-v
 
+CXXFLAGS:= $(filter-out -Werror=format-security, $(shell dpkg-buildflags --get CXXFLAGS))
+
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(filter $(DEB_BUILD_ARCH),mips mipsel))