Disable octave interface again due to FTBFS

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c418a14ef525368faa53174a25c31a5b807e13b..0bdde3af32926e64edd94e17514308f688d7bd90 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,7 @@ CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" ON "NOT enable-all-widge
 CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" ON "NOT enable-all-widgets" ON)
 CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" ON "NOT enable-all-widgets" ON)
 CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-all-widgets" ON)
-CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF)
+CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" OFF "enable-qt5" OFF)
 
 if(UNIX AND enable-rvalue)
        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
@@ -106,11 +106,11 @@ if(enable-qt4 OR enable-qt5)
 set(enable-qt ON)
 endif(enable-qt4 OR enable-qt5)
 
-CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" OFF)
+CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" 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" ON "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)
+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" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
 
 include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
 set(MGL_INCLUDE_PATH "${CMAKE_INSTALL_PREFIX}/include/mgl2")

diff --git a/debian/control b/debian/control
index b076928149c99dc2326a55955d35b8ebad1ea69e..46f397fee638f1687aea473b3179cea190ad4cef 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, swig, cmake, libxft-dev,
+ libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-dev,
  libjpeg-dev, libtiff-dev, libfltk1.3-dev, libqt4-dev, libwxgtk3.0-dev, 
- texinfo, texlive, texlive-generic-recommended, liboctave-dev,
+ texinfo, texlive, texlive-generic-recommended, liboctave-dev, liblua5.1-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
+ mpi-default-dev, swig3.0, cmake, libxft-dev
 Standards-Version: 3.9.5
 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 56eaf3d9e735aa1c6027267b52cddaa3506a3aaf..0ce7d5b949edad9d0905735cc073f12f7d1f4fb9 100644 (file)
--- a/debian/patches/CMakeLists.patch
+++ b/debian/patches/CMakeLists.patch
@@ -19,7 +19,7 @@
  option(enable-openmp "Enable OpenMP support" ON)
  option(enable-lgpl "Enable only LGPL part of MathGL")
  option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
-@@ -83,16 +83,16 @@
+@@ -83,18 +83,18 @@
  
  CMAKE_DEPENDENT_OPTION(enable-zlib "Enable zlib support" ON "NOT enable-all" ON)
  CMAKE_DEPENDENT_OPTION(enable-png "Enable png support" ON "NOT enable-all" ON)
@@ -44,17 +44,23 @@
 +CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" ON "NOT enable-all-widgets" ON)
 +CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" ON "NOT enable-all-widgets" ON)
  CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-all-widgets" ON)
- CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF)
+-CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF)
++CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" OFF "enable-qt5" OFF)
  
-@@ -107,9 +107,9 @@
+ if(UNIX AND enable-rvalue)
+       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+@@ -106,11 +106,11 @@
+ set(enable-qt ON)
  endif(enable-qt4 OR enable-qt5)
  
- CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" OFF)
+-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)
++CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" 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 "Enable octave interface" ON "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)
+ 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)
++MGL_DEPENDENT_OPTION(enable-octave-install "Octave interface will install for all users" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
  
  include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
+ set(MGL_INCLUDE_PATH "${CMAKE_INSTALL_PREFIX}/include/mgl2")

diff --git a/debian/patches/lang.patch b/debian/patches/lang.patch
deleted file mode 100644 (file)
index 960df3e..0000000
--- a/debian/patches/lang.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/lang/CMakeLists.txt
-+++ b/lang/CMakeLists.txt
-@@ -123,11 +123,13 @@
-       add_custom_target(mgl_octave_module ALL DEPENDS mathgl.tar.gz)
- 
-       install(FILES ${CMAKE_BINARY_DIR}/lang/mathgl.tar.gz DESTINATION ${MGL_DATA_PATH})
--      if(enable-octave-install)
--              install(CODE "execute_process(
--                      COMMAND ${oct_exec} -q --eval \"pkg install mathgl.tar.gz\"
--                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
--      endif(enable-octave-install)
-+      install(FILES ${CMAKE_BINARY_DIR}/lang/mathgl.oct DESTINATION ${MGL_DATA_PATH})
-+#     if(enable-octave-install)
-+#             install(CODE "execute_process(
-+#                     COMMAND ${oct_exec} -q --eval \"pkg prefix ${MathGL_SOURCE_DIR}/debian/tmp/usr/share/mathgl\"
-+#                     COMMAND ${oct_exec} -q --eval \"pkg install mathgl.tar.gz\"
-+#                     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
-+#     endif(enable-octave-install)
-       set(mgl_clean_files ${mgl_clean_files} mathgl)
- endif(enable-octave)
- set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${mgl_clean_files}")

diff --git a/debian/patches/series b/debian/patches/series
index 3a8f9d73890df2f72c06f4a98e148ad2ba0a3d47..04df76fbd196ba583eba5ab2da1e2510efaca123 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-lang.patch
-widgets.patch
 CMakeLists.patch
+widgets.patch

diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index 14261558d32f3523f3a0d79d80d83fa31530ea8b..68ec1179b9023b9b9bddb78bc57e557915f52651 100644 (file)
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -123,13 +123,11 @@ message(STATUS "${oct_prog} ${oct_host} ${oct_api}")
        add_custom_target(mgl_octave_module ALL DEPENDS mathgl.tar.gz)
 
        install(FILES ${CMAKE_BINARY_DIR}/lang/mathgl.tar.gz DESTINATION ${MGL_DATA_PATH})
-       install(FILES ${CMAKE_BINARY_DIR}/lang/mathgl.oct DESTINATION ${MGL_DATA_PATH})
-#      if(enable-octave-install)
-#              install(CODE "execute_process(
-#                      COMMAND ${oct_exec} -q --eval \"pkg prefix ${MathGL_SOURCE_DIR}/debian/tmp/usr/share/mathgl\"
-#                      COMMAND ${oct_exec} -q --eval \"pkg install mathgl.tar.gz\"
-#                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
-#      endif(enable-octave-install)
+       if(enable-octave-install)
+               install(CODE "execute_process(
+                       COMMAND ${oct_exec} -q --eval \"pkg install mathgl.tar.gz\"
+                       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
+       endif(enable-octave-install)
        set(mgl_clean_files ${mgl_clean_files} mathgl)
 endif(enable-octave)
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${mgl_clean_files}")