Add libqt5opengl5-dev and libxcursor-dev to BD to achieve build in a sid chroot

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d42271ce105ee4fa8ee1206d3abe9f447fc1f18a..e73b54b49fda15a9b73e39ca3f6f1ab1f8104982 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,7 @@ set(enable-qt ON)
 endif(enable-qt4 OR enable-qt5)
 
 CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" OFF)
-MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
+MGL_DEPENDENT_OPTION(enable-python "Enable python interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
 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)

diff --git a/debian/control b/debian/control
index 9e3ad7b50c32ce86d13e62ae8e642ef69d9ae01c..8efb3ee50b2eee505e3af59174f859ad92a4432f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
 Uploaders: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
 Build-Depends: debhelper (>= 9), libltdl-dev, libgsl0-dev, freeglut3-dev,
- libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-dev,
+ libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-dev, libqt5opengl5-dev,
  libjpeg-dev, libtiff-dev, libfltk1.3-dev, libqt5webkit5-dev, libwxgtk3.0-dev, 
- texinfo, texlive, texlive-generic-recommended, liboctave-dev, liblua5.1-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, swig, cmake, libxft-dev
+ mpi-default-dev, swig3.0, cmake, libxft-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 4802dd713ea40069c7e96b0b9cb3c5991638068e..f6d70e2e803fa6cfa098e701116359f19cafa7b4 100644 (file)
--- a/debian/patches/CMakeLists.patch
+++ b/debian/patches/CMakeLists.patch
@@ -60,6 +60,15 @@
  
  if(UNIX AND enable-rvalue)
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+@@ -117,7 +117,7 @@
+ endif(enable-qt4 OR enable-qt5)
+ 
+ CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" OFF)
+-MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
++MGL_DEPENDENT_OPTION(enable-python "Enable python interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
+ 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)