Refresh CMakeLists.patch, set compat=9 and restore liboctave-dev as build dep

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e73b54b49fda15a9b73e39ca3f6f1ab1f8104982..5f30b07e4101690d709da2734b0e18954e41c554 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -395,8 +395,6 @@ else(enable-glut)
        set(MGL_HAVE_GLUT 0)
 endif(enable-glut)
 
-set(FLTK_FLUID_EXECUTABLE usr/bin/fluid)
-
 if(enable-fltk)
        set(MGL_HAVE_FLTK 1)
        include(FindFLTK)

diff --git a/debian/compat b/debian/compat
index 3169c05c9ca553acae0baa6f09547a7881ab8e2e..7641d3f4289b0e9a01456d67a8214167e1d24af9 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7 
+9 
\ No newline at end of file

diff --git a/debian/control b/debian/control
index 8efb3ee50b2eee505e3af59174f859ad92a4432f..20c5ec6f91c6c4a2e7ce9f72b7a050c497484a88 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9), libltdl-dev, libgsl0-dev, freeglut3-dev,
  texinfo, texlive, texlive-generic-recommended, liblua5.1-dev, libxcursor-dev,
  libgif-dev, python-dev, python-numpy, libfontconfig1-dev, libqtwebkit-dev,
  libhdf4-dev, chrpath, libxinerama-dev, libxmu-dev, libxi-dev, libhpdf-dev,
- mpi-default-dev, swig3.0, cmake, libxft-dev
+ mpi-default-dev, swig3.0, cmake, libxft-dev, liboctave-dev
 Standards-Version: 3.9.6
 Homepage: http://mathgl.sourceforge.net/doc_en/Main.html
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/mathgl.git

diff --git a/debian/patches/CMakeLists.patch b/debian/patches/CMakeLists.patch
index f6d70e2e803fa6cfa098e701116359f19cafa7b4..cca3355cdc51ec2a1281e1dfefc6ec688dd15329 100644 (file)
--- a/debian/patches/CMakeLists.patch
+++ b/debian/patches/CMakeLists.patch
@@ -1,3 +1,4 @@
+Selection of enabled features and implementation of hardening flags during build
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -63,16 +63,16 @@
@@ -69,12 +70,3 @@
  MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
  MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
  MGL_DEPENDENT_OPTION(enable-octave-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
-@@ -395,6 +395,8 @@
-       set(MGL_HAVE_GLUT 0)
- endif(enable-glut)
- 
-+set(FLTK_FLUID_EXECUTABLE usr/bin/fluid)
-+
- if(enable-fltk)
-       set(MGL_HAVE_FLTK 1)
-       include(FindFLTK)