Hdf5 related build failure

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51c43c702fc31e0856c1f3860701e299ac0a8232..1791eaf29b15843c3238988e0c0b368e7934db85 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,9 +5,9 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
 set(MathGL_VERSION_MAJOR 2)
 set(MathGL_VERSION_MINOR 0)
 
-option(enable-double "Enable double precision in MathGL library")
-option(enable-all "Enable all features")
-option(enable-langall "Enable all language interfaces")
+option(enable-double "Enable double precision in MathGL library" ON)
+option(enable-all "Enable all features" ON)
+option(enable-langall "Enable all language interfaces" ON)
 option(enable-lgpl "Enable only LGPL part of MathGL" OFF)
 option(enable-ltdl "Enable loading modules support")
 option(enable-pthread "Enable POSIX threads support")
@@ -17,7 +17,7 @@ option(enable-jpeg "Enable jpeg support")
 option(enable-pdf "Enable pdf support")
 option(enable-gif "Enable gif support")
 option(enable-hdf4 "Enable hdf4 support")
-option(enable-hdf5 "Enable hdf5 1.6 support")
+option(enable-hdf5 "Enable hdf5 1.6 support" OFF)
 option(enable-hdf5_18 "Enable hdf5 1.8 support")
 option(enable-opengl "Enable OpenGL support" ON)
 option(enable-glut "Enable glut support")

diff --git a/debian/changelog b/debian/changelog
index c06cee7dbfd220264ec1ee59cd5565d6e8ebb358..dd858c133f97c22d84155150901de464dbf1e657 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mathgl (2.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Wed, 18 Apr 2012 17:17:00 +0200
+
 mathgl (2~rc2+svn403-1) experimental; urgency=low
 
   * Updated source from svn repository.

diff --git a/debian/control b/debian/control
index f47e0804f26668e660a7eda919ee06e39547ce57..7b12b317d124d9e35e8ffdb9a7f4334d9e3301f8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7.2.3~), libltdl-dev, libgsl0-dev, freeglut3-dev,
  libjpeg-dev, libtiff-dev, libfltk1.3-dev, libqt4-dev, libwxgtk2.8-dev, 
  texinfo, texi2html, texlive, texlive-generic-recommended, liboctave-dev,
  libgif-dev, python, python-dev, python-numpy, python-support, libfontconfig1-dev,
- libhdf4-dev, chrpath, libxinerama-dev, libxmu-dev, libxi-dev
+ libhdf4-dev, chrpath, libxinerama-dev, libxmu-dev, libxi-dev, libhpdf-dev
 Standards-Version: 3.9.3
 Homepage: http://mathgl.sourceforge.net/index.html
 Vcs-Git: git://git.debian.org/debian-science/packages/mathgl.git

diff --git a/debian/patches/CMakeLists-txt.patch b/debian/patches/CMakeLists-txt.patch
index 0cf17d00e230fcd220e33bf7579726b3593ec22b..03deeded473cf518601940ec9cc8ae642346c285 100644 (file)
--- a/debian/patches/CMakeLists-txt.patch
+++ b/debian/patches/CMakeLists-txt.patch
@@ -1,55 +1,24 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -2,28 +2,28 @@
+@@ -5,9 +5,9 @@
+ set(MathGL_VERSION_MAJOR 2)
+ set(MathGL_VERSION_MINOR 0)
  
- project( MathGL )
- set(CMAKE_VERBOSE_MAKEFILE ON)
 -option(enable-double "Enable double precision in MathGL library")
+-option(enable-all "Enable all features")
+-option(enable-langall "Enable all language interfaces")
 +option(enable-double "Enable double precision in MathGL library" ON)
- option(enable-all "Enable all features")
- option(enable-langall "Enable all language interfaces")
++option(enable-all "Enable all features" ON)
++option(enable-langall "Enable all language interfaces" ON)
  option(enable-lgpl "Enable only LGPL part of MathGL" OFF)
--option(enable-ltdl "Enable loading modules support")
--option(enable-pthread "Enable POSIX threads support")
--option(enable-gsl "Enable gsl support")
--option(enable-jpeg "Enable jpeg support")
-+option(enable-ltdl "Enable loading modules support" ON)
-+option(enable-pthread "Enable POSIX threads support" ON)
-+option(enable-gsl "Enable gsl support" ON)
-+option(enable-jpeg "Enable jpeg support" ON)
- option(enable-u3d "Enable u3d support")
+ option(enable-ltdl "Enable loading modules support")
+ option(enable-pthread "Enable POSIX threads support")
+@@ -17,7 +17,7 @@
  option(enable-pdf "Enable pdf support")
--option(enable-gif "Enable gif support")
--option(enable-hdf4 "Enable hdf4 support")
+ option(enable-gif "Enable gif support")
+ option(enable-hdf4 "Enable hdf4 support")
 -option(enable-hdf5 "Enable hdf5 1.6 support")
--option(enable-hdf5_18 "Enable hdf5 1.8 support")
-+option(enable-gif "Enable gif support" ON)
-+option(enable-hdf4 "Enable hdf4 support" ON)
-+option(enable-hdf5 "Enable hdf5 1.6 support" ON)
-+option(enable-hdf5_18 "Enable hdf5 1.8 support" ON)
++option(enable-hdf5 "Enable hdf5 1.6 support" OFF)
+ option(enable-hdf5_18 "Enable hdf5 1.8 support")
  option(enable-opengl "Enable OpenGL support" ON)
--option(enable-glut "Enable glut support")
--option(enable-fltk "Enable fltk widget")
--option(enable-wx "Enable wxWidget widget")
--option(enable-qt "Enable Qt4 widget")
--option(enable-python "Enable python interface")
--option(enable-octave "Enable octave interface")
--option(enable-doc "Enable documentation building")
-+option(enable-glut "Enable glut support" ON)
-+option(enable-fltk "Enable fltk widget" ON)
-+option(enable-wx "Enable wxWidget widget" ON)
-+option(enable-qt "Enable Qt4 widget" ON)
-+option(enable-python "Enable python interface" ON)
-+option(enable-octave "Enable octave interface" ON)
-+option(enable-doc "Enable documentation building" ON)
- 
- include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
- 
-@@ -238,6 +238,7 @@
- 
- if((enable-langall OR enable-octave) AND (NOT enable-lgpl) )
-       set(MGL_HAVE_OCTAVE 1)
-+      set(OCTAVE_INCLUDE_DIR "/usr/include/octave-3.6.1")
-       find_path(OCTAVE_INCLUDE_DIR octave/oct.h)
-       if(NOT OCTAVE_INCLUDE_DIR)
-               message(SEND_ERROR "Couldn't find octave/oct.h needed for octave interfaces compiling.")
+ option(enable-glut "Enable glut support")

diff --git a/debian/patches/lang-CMakeLists-txt.patch b/debian/patches/lang-CMakeLists-txt.patch
deleted file mode 100644 (file)
index 548469b..0000000
--- a/debian/patches/lang-CMakeLists-txt.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/lang/CMakeLists.txt
-+++ b/lang/CMakeLists.txt
-@@ -35,6 +35,6 @@
-               WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang
-       )
-       add_custom_target(mgl_python_module ALL DEPENDS _mathgl.so mathgl.py)
--      install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
-+      install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_SOURCE_DIR}/debian/tmp/usr --install-layout=deb WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )")
-       set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "setup.py;mgl_wrap.cpp;build;mathgl.pyc")
- endif(MGL_HAVE_PYTHON)

diff --git a/debian/patches/series b/debian/patches/series
index 0f11d69ac48bd9a923e63e47805c831949249d0c..4277de1289da0f79046007582058505143729fb1 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-lang-CMakeLists-txt.patch
 CMakeLists-txt.patch