Built with disabled doc generation and hdf5 support

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d575ed66d86e4997856a2260c9a0aba8941472b..75a18e777971933632b4d5a0e2447dda294d45ec 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ option(enable-pdf "Enable pdf support")
 option(enable-gif "Enable gif support" ON)
 option(enable-hdf4 "Enable hdf4 support" ON)
 option(enable-hdf5 "Enable hdf5 1.6 support")
-option(enable-hdf5_18 "Enable hdf5 1.8 support" ON)
+option(enable-hdf5_18 "Enable hdf5 1.8 support")
 option(enable-opengl "Enable OpenGL support" ON)
 option(enable-glut "Enable glut support" ON)
 option(enable-fltk "Enable fltk widget" ON)
@@ -23,7 +23,7 @@ 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)
+option(enable-doc "Enable documentation building")
 if(enable-double)
        set(use_double 1)
 endif(enable-double)

diff --git a/debian/patches/CMakeLists-txt.patch b/debian/patches/CMakeLists-txt.patch
index d0da5ee1e3649090ea34c21f15193e75c49e5d7b..5961df4fb6ce561320f459d1a0e5d1b479234084 100644 (file)
--- a/debian/patches/CMakeLists-txt.patch
+++ b/debian/patches/CMakeLists-txt.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -2,28 +2,28 @@
+@@ -2,27 +2,27 @@
  
  project( MathGL )
  set(CMAKE_VERBOSE_MAKEFILE ON)
@@ -24,8 +24,7 @@
 +option(enable-gif "Enable gif support" ON)
 +option(enable-hdf4 "Enable hdf4 support" ON)
  option(enable-hdf5 "Enable hdf5 1.6 support")
--option(enable-hdf5_18 "Enable hdf5 1.8 support")
-+option(enable-hdf5_18 "Enable hdf5 1.8 support" ON)
+ 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")
@@ -33,14 +32,12 @@
 -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)
+ option(enable-doc "Enable documentation building")
  if(enable-double)
        set(use_double 1)
- endif(enable-double)

diff --git a/debian/rules b/debian/rules
index 0ed911d41a8c3cfd1b9ed907d54f0cadbfa88455..79e59f3a4c7c0720e3dc6007f4e82ab0ca7506ee 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,22 +12,6 @@ export DH_OPTIONS=-v
 
 clean:
        dh_testdir
-#      rm -rf png/*.png lang/CMakeFiles/_mathgl.dir/mglPYTHON_wrap.cxx.o \
-#            CMakeFiles/CompilerIdC/a.out CMakeFiles/CompilerIdCXX/a.out \
-#            lang/_mathgl.so CMakeCache.txt CMakeFiles Makefile\
-#            cmake_install.cmake examples/CMakeFiles examples/Makefile \
-#            examples/cmake_install.cmake include/CMakeFiles \
-#            include/Makefile include/cmake_install.cmake \
-#            include/mgl/config.h lang/CMakeFiles lang/Makefile \
-#            lang/cmake_install.cmake lang/mathgl.py lang/mglPYTHON_wrap.cxx \
-#            src/CMakeFiles src/Makefile src/cmake_install.cmake \
-#            texinfo/CMakeFiles texinfo/Makefile texinfo/cmake_install.cmake \
-#            udav/CMakeFiles udav/Makefile udav/cmake_install.cmake \
-#            udav/udav.qrc.depends utils/CMakeFiles utils/Makefile \
-#            utils/cmake_install.cmake widgets/CMakeFiles widgets/Makefile \
-#            widgets/cmake_install.cmake widgets/libmgl-wnd.so src/libmgl.so \
-#            widgets/libmgl-wnd.so.6.0.0 examples/mgl_example utils/mglconv \
-#            src/libmgl.a src/libmgl.so.6.0.0 widgets/libmgl-wnd.a
        dh_auto_clean --buildsystem=cmake
        dh_clean