Built after selecting all features individually

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1791eaf29b15843c3238988e0c0b368e7934db85..94e8fc9c3a7723ab303430e66459af492bf6ff7c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,24 +9,24 @@ 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")
-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-pdf "Enable pdf support")
-option(enable-gif "Enable gif support")
-option(enable-hdf4 "Enable hdf4 support")
+option(enable-pdf "Enable pdf support" ON)
+option(enable-gif "Enable gif support" ON)
+option(enable-hdf4 "Enable hdf4 support" ON)
 option(enable-hdf5 "Enable hdf5 1.6 support" OFF)
-option(enable-hdf5_18 "Enable hdf5 1.8 support")
+option(enable-hdf5_18 "Enable hdf5 1.8 support" ON)
 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)
 

diff --git a/debian/mathgl-doc-en.install b/debian/mathgl-doc-en.install
index afd8e72922f200a8c712b721d50250508c615dac..26828559b385f4cc98f07e2000243d3b9d1a5eae 100644 (file)
--- a/debian/mathgl-doc-en.install
+++ b/debian/mathgl-doc-en.install
@@ -1,10 +1,10 @@
 debian/tmp/usr/share/doc/mathgl/*.png 
 debian/tmp/usr/share/doc/mathgl/*.html
 debian/tmp/usr/share/doc/mathgl/*.pdf
-debian/tmp/usr/share/doc/mathgl/small/*.png 
-debian/tmp/usr/share/doc/mathgl/png/*.png
+debian/tmp/usr/share/doc/mathgl/small/* 
+debian/tmp/usr/share/doc/mathgl/png/*
 debian/tmp/usr/share/doc/mathgl/mathgl_en.info* usr/share/info/
-debian/tmp/usr/share/doc/mathgl/mgl_web_en/* 
+debian/tmp/usr/share/doc/mathgl/doc_en/* 
 debian/tmp/usr/share/doc/mathgl/web_en/*
 debian/tmp/usr/share/doc/mathgl/mathgl_en/* 
 debian/folder/mathgl-doc-en /usr/share/doc-base/
\ No newline at end of file

diff --git a/debian/patches/CMakeLists-txt.patch b/debian/patches/CMakeLists-txt.patch
index 03deeded473cf518601940ec9cc8ae642346c285..1c83332e72f42c11ce1b73ac65442208eff3cbed 100644 (file)
--- a/debian/patches/CMakeLists-txt.patch
+++ b/debian/patches/CMakeLists-txt.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -5,9 +5,9 @@
+@@ -5,28 +5,28 @@
  set(MathGL_VERSION_MAJOR 2)
  set(MathGL_VERSION_MINOR 0)
  
@@ -11,14 +11,40 @@
 +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-pdf "Enable pdf support")
- option(enable-gif "Enable gif support")
- option(enable-hdf4 "Enable hdf4 support")
+-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-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_18 "Enable hdf5 1.8 support")
++option(enable-pdf "Enable pdf support" ON)
++option(enable-gif "Enable gif support" ON)
++option(enable-hdf4 "Enable hdf4 support" ON)
 +option(enable-hdf5 "Enable hdf5 1.6 support" OFF)
- option(enable-hdf5_18 "Enable hdf5 1.8 support")
++option(enable-hdf5_18 "Enable hdf5 1.8 support" ON)
  option(enable-opengl "Enable OpenGL support" ON)
- option(enable-glut "Enable glut support")
+-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)
+ 

diff --git a/debian/patches/lang-CMakeLists-txt.patch b/debian/patches/lang-CMakeLists-txt.patch
new file mode 100644 (file)
index 0000000..8c9e7a5
--- /dev/null
+++ b/debian/patches/lang-CMakeLists-txt.patch
@@ -0,0 +1,11 @@
+--- a/lang/CMakeLists.txt
++++ b/lang/CMakeLists.txt
+@@ -43,7 +43,7 @@
+               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 "mgl_wrap.cpp;build;mathgl.pyc")
+ endif(MGL_HAVE_PYTHON)
+ 

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

diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index d6467f06d687fe29f566477b0183dddc603a3756..e57365383714ee07f2a16d2afdb4430e84be1bd3 100644 (file)
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -43,7 +43,7 @@ if(MGL_HAVE_PYTHON)
                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 "mgl_wrap.cpp;build;mathgl.pyc")
 endif(MGL_HAVE_PYTHON)