From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Fri, 28 Aug 2015 00:52:51 +0000 (+0300)
Subject: Refresh CMakeLists.patch, set compat=9 and restore liboctave-dev as build dep
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~96
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c384648d50d657f3b9b0e70acf2bd6e1748c0a7d;p=mathgl.git

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e73b54b..5f30b07 100644
--- 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 3169c05..7641d3f 100644
--- 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 8efb3ee..20c5ec6 100644
--- 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 f6d70e2..cca3355 100644
--- 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)