[mathgl] 01/01: Disable octave interface again due to FTBFS
Dimitrios Eftaxiopoulos
eftaxiop-guest at moszumanska.debian.org
Wed Sep 10 21:59:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch master
in repository mathgl.
commit e384b3478198c2912fb1b131b5dffb4c921a2346
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Thu Sep 11 00:57:47 2014 +0300
Disable octave interface again due to FTBFS
---
CMakeLists.txt | 8 ++++----
debian/control | 6 +++---
debian/patches/CMakeLists.patch | 20 +++++++++++++-------
debian/patches/lang.patch | 21 ---------------------
debian/patches/series | 3 +--
lang/CMakeLists.txt | 12 +++++-------
6 files changed, 26 insertions(+), 44 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c418a1..0bdde3a 100644
--- 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 b076928..46f397f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Dimitrios Eftaxiopoulos <eftaxi12 at 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 56eaf3d..0ce7d5b 100644
--- 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
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 3a8f9d7..04df76f 100644
--- 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 1426155..68ec117 100644
--- 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}")
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathgl.git
More information about the debian-science-commits
mailing list