diff -Nru freefem++-3.61.1+dfsg1/debian/changelog freefem++-3.61.1+dfsg1/debian/changelog
--- freefem++-3.61.1+dfsg1/debian/changelog	2019-08-24 19:01:06.000000000 +0000
+++ freefem++-3.61.1+dfsg1/debian/changelog	2019-10-05 07:21:24.000000000 +0000
@@ -1,8 +1,12 @@
-freefem++ (3.61.1+dfsg1-4ubuntu1) eoan; urgency=medium
+freefem++ (3.61.1+dfsg1-5) unstable; urgency=medium
 
-  * Drop unused build-dependency on obsolete petsc 3.10 packages.
+  * Team upload.
+  * Build-Depends non-versioned libpetsc-real-dev and libpetsc-complex-dev
+    Closes: #939663
+  * debhelper-compat 12
+  * Rework manual changes in source tree to quilt patches
 
- -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 24 Aug 2019 12:01:06 -0700
+ -- Andreas Tille <tille@debian.org>  Sat, 05 Oct 2019 09:21:24 +0200
 
 freefem++ (3.61.1+dfsg1-4) unstable; urgency=medium
 
diff -Nru freefem++-3.61.1+dfsg1/debian/compat freefem++-3.61.1+dfsg1/debian/compat
--- freefem++-3.61.1+dfsg1/debian/compat	2018-08-05 10:33:22.000000000 +0000
+++ freefem++-3.61.1+dfsg1/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru freefem++-3.61.1+dfsg1/debian/control freefem++-3.61.1+dfsg1/debian/control
--- freefem++-3.61.1+dfsg1/debian/control	2019-08-24 19:01:06.000000000 +0000
+++ freefem++-3.61.1+dfsg1/debian/control	2019-10-05 07:21:24.000000000 +0000
@@ -1,11 +1,10 @@
 Source: freefem++
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
+Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
 Uploaders: Christophe Trophime <christophe.trophime@lncmi.cnrs.fr>,
            Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 12),
                libsuperlu-dev,
                gawk,
                gfortran,
@@ -43,13 +42,15 @@
                coinor-libipopt-dev,
                libgmm++-dev,
                libtet1.5-dev,
+               libpetsc-real-dev,
+               libpetsc-complex-dev
 # libmmg3dlib4.0-4.0-dev, freeyams, mshmet, mshint,
 # libparms2-dev, libitsol-dev,
 # libhips-dev, libpastix-dev,
 # libsuperlu-dist-dev
-Standards-Version: 4.3.0.1
-Vcs-Git: https://salsa.debian.org/science-team/freefempp.git
+Standards-Version: 4.4.1
 Vcs-Browser: https://salsa.debian.org/science-team/freefempp
+Vcs-Git: https://salsa.debian.org/science-team/freefempp.git
 Homepage: http://www.freefem.org/ff++/
 
 Package: freefem++
diff -Nru freefem++-3.61.1+dfsg1/debian/patches/examples-bamg.patch freefem++-3.61.1+dfsg1/debian/patches/examples-bamg.patch
--- freefem++-3.61.1+dfsg1/debian/patches/examples-bamg.patch	2018-08-07 23:34:28.000000000 +0000
+++ freefem++-3.61.1+dfsg1/debian/patches/examples-bamg.patch	2019-10-05 07:21:24.000000000 +0000
@@ -1,8 +1,10 @@
+Description: Fix perl interpreter path
+
 --- a/examples-bamg/test/dotest.pl
 +++ b/examples-bamg/test/dotest.pl
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
-+#!/usrbin/perl
++#!/usr/bin/perl
  # -----  clean ---
  unlink <*.mesh>;
  unlink <*.am_fmt>;
diff -Nru freefem++-3.61.1+dfsg1/debian/patches/examples++-load.patch freefem++-3.61.1+dfsg1/debian/patches/examples++-load.patch
--- freefem++-3.61.1+dfsg1/debian/patches/examples++-load.patch	2018-08-08 00:03:08.000000000 +0000
+++ freefem++-3.61.1+dfsg1/debian/patches/examples++-load.patch	2019-10-05 07:21:24.000000000 +0000
@@ -1,6 +1,11 @@
+Author: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
+Last-Update: Thu, 19 Dec 2013 22:38:49 +0200
+Bug-Debian: https://bugs.debian.org/730738
+Description: Correct architecture names for hurd and kfreebsd
+
 --- a/examples++-load/load.link.in
 +++ b/examples++-load/load.link.in
-@@ -228,7 +228,7 @@
+@@ -228,7 +228,7 @@ case "$WIN32$uu" in
          LIBS="'$b/libff.dll' $LIBS $DLL"
  #        SUF=dll
  	;;
@@ -9,16 +14,3 @@
  	SHARED="-shared" 
  	FLAGS='-fPIC';;
  	# 64 bit Linux needs -fPIC (ALH)
---- a/examples++-load/Makefile.am
-+++ b/examples++-load/Makefile.am
-@@ -235,8 +235,8 @@
- 	  sed <$$i >$(DESTDIR)$(ff_prefix_dir)/lib/$$i 's#$(abs_top_builddir)/download#$(ff_prefix_dir)#' ;\
- 	 done
- 	echo loadpath += \"./\"  >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
--	echo loadpath += \"$(ff_prefix_dir)/lib\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
--	echo includepath += \"$(ff_prefix_dir)/idp\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
-+	echo loadpath += \"$(prefix)/lib/freefem++\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
-+	echo includepath += \"$(prefix)/include/freefem++/idp\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- 	$(INSTALL_SCRIPT) ff-c++  $(DESTDIR)${bindir}
- 	$(INSTALL_SCRIPT) ff-pkg-download  $(DESTDIR)${bindir}
- 	$(INSTALL_SCRIPT) ff-get-dep   $(DESTDIR)${bindir}
diff -Nru freefem++-3.61.1+dfsg1/debian/patches/fix_all.edp.patch freefem++-3.61.1+dfsg1/debian/patches/fix_all.edp.patch
--- freefem++-3.61.1+dfsg1/debian/patches/fix_all.edp.patch	1970-01-01 00:00:00.000000000 +0000
+++ freefem++-3.61.1+dfsg1/debian/patches/fix_all.edp.patch	2019-10-05 07:21:24.000000000 +0000
@@ -0,0 +1,184 @@
+Description: Just another hack right into the source tree
+Author: Andreas Tille <tille@debian.org> ... giving up here to disassemble non-clean changes to source tree into sensible quilt patches
+
+--- freefem++-3.61.1+dfsg1.orig/examples++-3d/all.edp
++++ freefem++-3.61.1+dfsg1/examples++-3d/all.edp
+@@ -7,62 +7,6 @@ verbosity=verbosityy;searchMethod=0;
+ verbosity=verbosityy;searchMethod=0;
+ { include "ArrayFE-3d.edp";};
+  cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+- cout << "--------- file : EqPoisson.edp --------------------------------------------------------" << endl;
+-verbosity=verbosityy;searchMethod=0;
+-{ include "EqPoisson.edp";};
+- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+- cout << "--------- file : Lac.edp --------------------------------------------------------" << endl;
+-verbosity=verbosityy;searchMethod=0;
+-{ include "Lac.edp";};
+- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+- cout << "--------- file : Laplace-Adapt-3d.edp --------------------------------------------------------" << endl;
+-verbosity=verbosityy;searchMethod=0;
+-{ include "Laplace-Adapt-3d.edp";};
+- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+- cout << "--------- file : Laplace-Adapt-aniso-3d.edp --------------------------------------------------------" << endl;
+-verbosity=verbosityy;searchMethod=0;
+-{ include "Laplace-Adapt-aniso-3d.edp";};
+- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+- cout << "--------- file : Laplace3d.edp --------------------------------------------------------" << endl;
+-verbosity=verbosityy;searchMethod=0;
+-{ include "Laplace3d.edp";};
+- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+- cout << "--------- file : LaplaceRT-3d.edp --------------------------------------------------------" << endl;
+-verbosity=verbosityy;searchMethod=0;
+-{ include "LaplaceRT-3d.edp";};
+- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+- cout << "--------- file : NSI3d-carac.edp --------------------------------------------------------" << endl;
+-verbosity=verbosityy;searchMethod=0;
+-{ include "NSI3d-carac.edp";};
+- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+- cout << "--------- file : NSI3d.edp --------------------------------------------------------" << endl;
+-verbosity=verbosityy;searchMethod=0;
+-{ include "NSI3d.edp";};
+- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+- cout << "--------- file : Period-Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
+-verbosity=verbosityy;searchMethod=0;
+-{ include "Period-Poisson-cube-ballon.edp";};
+- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+- cout << "--------- file : Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
+-verbosity=verbosityy;searchMethod=0;
+-{ include "Poisson-cube-ballon.edp";};
+- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+- cout << "--------- file : Poisson.edp --------------------------------------------------------" << endl;
+-verbosity=verbosityy;searchMethod=0;
+-{ include "Poisson.edp";};
+- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+- cout << "--------- file : Poisson3d.edp --------------------------------------------------------" << endl;
+-verbosity=verbosityy;searchMethod=0;
+-{ include "Poisson3d.edp";};
+- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+- cout << "--------- file : Stokes.edp --------------------------------------------------------" << endl;
+-verbosity=verbosityy;searchMethod=0;
+-{ include "Stokes.edp";};
+- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+- cout << "--------- file : TruncLac.edp --------------------------------------------------------" << endl;
+-verbosity=verbosityy;searchMethod=0;
+-{ include "TruncLac.edp";};
+- cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+  cout << "--------- file : beam-3d.edp --------------------------------------------------------" << endl;
+ verbosity=verbosityy;searchMethod=0;
+ { include "beam-3d.edp";};
+@@ -91,6 +35,10 @@ verbosity=verbosityy;searchMethod=0;
+ verbosity=verbosityy;searchMethod=0;
+ { include "cylinder.edp";};
+  cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++ cout << "--------- file : EqPoisson.edp --------------------------------------------------------" << endl;
++verbosity=verbosityy;searchMethod=0;
++{ include "EqPoisson.edp";};
++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+  cout << "--------- file : fallingspheres.edp --------------------------------------------------------" << endl;
+ verbosity=verbosityy;searchMethod=0;
+ { include "fallingspheres.edp";};
+@@ -103,10 +51,38 @@ verbosity=verbosityy;searchMethod=0;
+ verbosity=verbosityy;searchMethod=0;
+ { include "intlevelset3d.edp";};
+  cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++ cout << "--------- file : Lac.edp --------------------------------------------------------" << endl;
++verbosity=verbosityy;searchMethod=0;
++{ include "Lac.edp";};
++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++ cout << "--------- file : Laplace3d.edp --------------------------------------------------------" << endl;
++verbosity=verbosityy;searchMethod=0;
++{ include "Laplace3d.edp";};
++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++ cout << "--------- file : Laplace-Adapt-3d.edp --------------------------------------------------------" << endl;
++verbosity=verbosityy;searchMethod=0;
++{ include "Laplace-Adapt-3d.edp";};
++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++ cout << "--------- file : Laplace-Adapt-aniso-3d.edp --------------------------------------------------------" << endl;
++verbosity=verbosityy;searchMethod=0;
++{ include "Laplace-Adapt-aniso-3d.edp";};
++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++ cout << "--------- file : LaplaceRT-3d.edp --------------------------------------------------------" << endl;
++verbosity=verbosityy;searchMethod=0;
++{ include "LaplaceRT-3d.edp";};
++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+  cout << "--------- file : meditddm.edp --------------------------------------------------------" << endl;
+ verbosity=verbosityy;searchMethod=0;
+ { include "meditddm.edp";};
+  cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++ cout << "--------- file : NSI3d-carac.edp --------------------------------------------------------" << endl;
++verbosity=verbosityy;searchMethod=0;
++{ include "NSI3d-carac.edp";};
++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++ cout << "--------- file : NSI3d.edp --------------------------------------------------------" << endl;
++verbosity=verbosityy;searchMethod=0;
++{ include "NSI3d.edp";};
++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+  cout << "--------- file : p.edp --------------------------------------------------------" << endl;
+ verbosity=verbosityy;searchMethod=0;
+ { include "p.edp";};
+@@ -115,6 +91,22 @@ verbosity=verbosityy;searchMethod=0;
+ verbosity=verbosityy;searchMethod=0;
+ { include "periodic-3d.edp";};
+  cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++ cout << "--------- file : Period-Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
++verbosity=verbosityy;searchMethod=0;
++{ include "Period-Poisson-cube-ballon.edp";};
++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++ cout << "--------- file : Poisson3d.edp --------------------------------------------------------" << endl;
++verbosity=verbosityy;searchMethod=0;
++{ include "Poisson3d.edp";};
++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++ cout << "--------- file : Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
++verbosity=verbosityy;searchMethod=0;
++{ include "Poisson-cube-ballon.edp";};
++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++ cout << "--------- file : Poisson.edp --------------------------------------------------------" << endl;
++verbosity=verbosityy;searchMethod=0;
++{ include "Poisson.edp";};
++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+  cout << "--------- file : pyramide.edp --------------------------------------------------------" << endl;
+ verbosity=verbosityy;searchMethod=0;
+ { include "pyramide.edp";};
+@@ -139,6 +131,10 @@ verbosity=verbosityy;searchMethod=0;
+ verbosity=verbosityy;searchMethod=0;
+ { include "sphereincube.edp";};
+  cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++ cout << "--------- file : Stokes.edp --------------------------------------------------------" << endl;
++verbosity=verbosityy;searchMethod=0;
++{ include "Stokes.edp";};
++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+  cout << "--------- file : tetgencube.edp --------------------------------------------------------" << endl;
+ verbosity=verbosityy;searchMethod=0;
+ { include "tetgencube.edp";};
+@@ -147,3 +143,7 @@ verbosity=verbosityy;searchMethod=0;
+ verbosity=verbosityy;searchMethod=0;
+ { include "tetgenholeregion.edp";};
+  cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
++ cout << "--------- file : TruncLac.edp --------------------------------------------------------" << endl;
++verbosity=verbosityy;searchMethod=0;
++{ include "TruncLac.edp";};
++ cout << " mem leak = " <<storageused() - MEM1234 << endl << "------------------------------------------------------------------------------ " << endl;
+--- freefem++-3.61.1+dfsg1.orig/examples++-load/Makefile.am
++++ freefem++-3.61.1+dfsg1/examples++-load/Makefile.am
+@@ -235,8 +235,8 @@ install-exec-local:: load_compile WHERE_
+ 	  sed <$$i >$(DESTDIR)$(ff_prefix_dir)/lib/$$i 's#$(abs_top_builddir)/download#$(ff_prefix_dir)#' ;\
+ 	 done
+ 	echo loadpath += \"./\"  >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+-	echo loadpath += \"$(ff_prefix_dir)/lib\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+-	echo includepath += \"$(ff_prefix_dir)/idp\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
++	echo loadpath += \"$(prefix)/lib/freefem++\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
++	echo includepath += \"$(prefix)/include/freefem++/idp\"  >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+ 	$(INSTALL_SCRIPT) ff-c++  $(DESTDIR)${bindir}
+ 	$(INSTALL_SCRIPT) ff-pkg-download  $(DESTDIR)${bindir}
+ 	$(INSTALL_SCRIPT) ff-get-dep   $(DESTDIR)${bindir}
+--- freefem++-3.61.1+dfsg1.orig/src/fflib/strversionnumber.cpp
++++ freefem++-3.61.1+dfsg1/src/fflib/strversionnumber.cpp
+@@ -18,6 +18,6 @@ string StrVersionNumber(){
+ //  buffer.precision(8);
+ //  buffer<<VersionNumber();
+   static char buffer[100];
+-  sprintf(buffer," %9f (date Jeu 12 jul 2018 12:05:08 CEST)",VersionNumber());
+-  return buffer; //.str()+" (date Jeu 12 jul 2018 12:05:08 CEST)" ;
++  sprintf(buffer," %9f (date Σαβ 08 Δεκ 2018 10:26:36 πμ EET)",VersionNumber());
++  return buffer; //.str()+" (date Σαβ 08 Δεκ 2018 10:26:36 πμ EET)" ;
+ }
diff -Nru freefem++-3.61.1+dfsg1/debian/patches/gmm_cxxflags.patch freefem++-3.61.1+dfsg1/debian/patches/gmm_cxxflags.patch
--- freefem++-3.61.1+dfsg1/debian/patches/gmm_cxxflags.patch	1970-01-01 00:00:00.000000000 +0000
+++ freefem++-3.61.1+dfsg1/debian/patches/gmm_cxxflags.patch	2019-10-05 07:21:24.000000000 +0000
@@ -0,0 +1,38 @@
+Author: Andreas Tille <tille@debian.org>
+Last-Update: Sat, 05 Oct 2019 08:02:23 +0200
+Description: This change was done inside master branch of
+ packaging dir.  Its now provided as quilt patch.
+ It is adding some hardening flags and provides correct
+ PATH to binaries
+
+--- a/download/gmm/cxxflags
++++ b/download/gmm/cxxflags
+@@ -1,16 +1,16 @@
+-CXX = g++
+-MPICXX = /usr/local/ff++/openmpi-2.1/bin/mpic++
+-ac_ct_CXX = g++
+-CC = gcc
+-H5CC = /usr/local/ff++/openmpi-2.1/bin/h5cc
+-HDF5_CC = clang
+-MPICC = /usr/local/ff++/openmpi-2.1/bin/mpicc
++CXX = g++ -Wl,-z,relro -Wl,--as-needed
++MPICXX = mpic++ -Wl,-z,relro -Wl,--as-needed
++ac_ct_CXX = 
++CC = gcc -Wl,-z,relro -Wl,--as-needed
++H5CC = /usr/bin/h5cc
++HDF5_CC = gcc
++MPICC = /usr/bin/mpicc
+ YACC = bison -y
+-ac_ct_CC = gcc
+-CXXFLAGS = -Wno-undefined-var-template -m64 -fPIC -DNDEBUG -O3 -O3 -O3 -DBAMG_LONG_LONG  -DNCHECKPTR  -fPIC
+-CFLAGS = -g  -m64 -fPIC -DNDEBUG -O3 -O3 -O3 -fPIC
+-FCFLAGS = -g -fPIC
+-GSL_CFLAGS = -I/usr/local/ff++/openmpi-2.1/include
++ac_ct_CC = gcc -Wl,-z,relro -Wl,--as-needed
++CXXFLAGS = -g  -fstack-protector-strong -Wformat -Werror=format-security -DNDEBUG -O3 -mmmx -mavx -DBAMG_LONG_LONG  -DNCHECKPTR -fPIC
++CFLAGS = -g  -fstack-protector-strong -Wformat -Werror=format-security -Wall -pedantic -DNDEBUG -O3 -mmmx -mavx -fPIC
++FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
++GSL_CFLAGS = -I/usr/include
+ HDF5_CFLAGS = 
+ WGET = wget --no-check-certificate
+ WIN32DLLTARGET = 
diff -Nru freefem++-3.61.1+dfsg1/debian/patches/series freefem++-3.61.1+dfsg1/debian/patches/series
--- freefem++-3.61.1+dfsg1/debian/patches/series	2018-12-08 08:11:54.000000000 +0000
+++ freefem++-3.61.1+dfsg1/debian/patches/series	2019-10-05 07:21:24.000000000 +0000
@@ -1,3 +1,5 @@
+gmm_cxxflags.patch
 examples-bamg.patch
 examples++-load.patch
 src_fflib.patch
+fix_all.edp.patch
diff -Nru freefem++-3.61.1+dfsg1/debian/patches/src_fflib.patch freefem++-3.61.1+dfsg1/debian/patches/src_fflib.patch
--- freefem++-3.61.1+dfsg1/debian/patches/src_fflib.patch	2018-12-08 08:21:05.000000000 +0000
+++ freefem++-3.61.1+dfsg1/debian/patches/src_fflib.patch	2019-10-05 07:21:24.000000000 +0000
@@ -1,7 +1,12 @@
-Fix compilation with gcc-8/g++-8
+Author: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
+Last-Update: Sat, 08 Dec 2018 11:04:55 +0200
+Bug-Debian: https://bugs.debian.org/897751
+            https://bugs.debian.org/915732
+Desciption: Fix compilation with gcc-8/g++-8
+
 --- a/src/fflib/problem.cpp
 +++ b/src/fflib/problem.cpp
-@@ -5810,7 +5810,7 @@
+@@ -5810,7 +5810,7 @@ TypeSolveMat::TSolveMat  TypeSolveMat::d
  
  
  template<class R,class FESpace,class v_fes>
@@ -10,7 +15,7 @@
        MatriceCreuse< typename CadnaType<R>::Scalaire >   * & cadnamat ) const
  {  
      typedef typename  FESpace::Mesh Mesh;
-@@ -6123,6 +6123,11 @@
+@@ -6123,6 +6123,11 @@ AnyType Problem::eval(Stack stack,Data<F
    return SetAny<const Problem *>(this);
  }
  
diff -Nru freefem++-3.61.1+dfsg1/debian/results.txt freefem++-3.61.1+dfsg1/debian/results.txt
--- freefem++-3.61.1+dfsg1/debian/results.txt	2019-08-24 19:01:06.000000000 +0000
+++ freefem++-3.61.1+dfsg1/debian/results.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-# Automatically generated
-# duptype id depth size device inode priority name
-DUPTYPE_FIRST_OCCURRENCE 1 0 151120680 64769 271777 5 debian/tmp/usr/bin/FreeFem++
-DUPTYPE_WITHIN_SAME_TREE -1 0 151120680 64769 271778 5 debian/tmp/usr/bin/FreeFem++-nw
-# end of file