Docs build and libmgl-glut dependency problems

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01a9fee1d9acfce584253f070d484560feb75fbd..38acc65bc6033104842da6c86238aead74a91daa 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,27 +2,27 @@ cmake_minimum_required(VERSION 2.6)
 
 project( MathGL )
 set(CMAKE_VERBOSE_MAKEFILE ON)
-option(enable-double "Enable double precision in MathGL library")
+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-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-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-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-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")
 if(enable-double)
        set(use_double 1)

diff --git a/debian/changelog b/debian/changelog
index 08c6d7df1de45227ebf2089cbe8d99a5403fe368..84982fa090f40bd45c5b9f00220c1d6d558a2991 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
+mathgl (2~rc2+svn364-1) experimental; urgency=low
+
+  * Updated source from svn repository.
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Thu, 15 Mar 2012 17:02:00 +0200
+
 mathgl (2~rc2+svn363-1) experimental; urgency=low
 
   * Updated source from svn repository.
 
- -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Thu, 15 Mar 2012 13:26:00 +0200
+ -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Thu, 15 Mar 2012 12:20:00 +0200
 
 mathgl (2~rc2+svn362-1) experimental; urgency=low
 

diff --git a/debian/patches/CMakeLists-txt.patch b/debian/patches/CMakeLists-txt.patch
new file mode 100644 (file)
index 0000000..9df72d4
--- /dev/null
+++ b/debian/patches/CMakeLists-txt.patch
@@ -0,0 +1,44 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,27 +2,27 @@
+ 
+ project( MathGL )
+ set(CMAKE_VERBOSE_MAKEFILE ON)
+-option(enable-double "Enable double precision in MathGL library")
++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-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-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-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-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")
+ if(enable-double)
+       set(use_double 1)

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

diff --git a/debian/rules b/debian/rules
index 3ffcb9656e6a5e53246d2e8fe916f21c9c98fd38..69c26763cb8f9c304da031213c370d5ec0a8c271 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,28 +37,28 @@ binary-indep:
        dh_installcatalogs -i
        dh_installcron -i
        dh_installdebconf -i
-#      dh_installemacsen -i
-#      dh_installifupdown -i
-#      dh_installinfo -i
-#      dh_pysupport -i
-#      dh_installinit -i
-#      dh_installmenu -i
-#      dh_installmime -i
-#      dh_installmodules -i
-#      dh_installlogcheck -i
-#      dh_installlogrotate -i
-#      dh_installpam -i
-#      dh_installppp -i
-#      dh_installudev -i
-#      dh_installwm -i
-#      dh_installxfonts -i
-#      dh_bugfiles -i
-#      dh_lintian -i
-#      dh_gconf -i
-#      dh_icons -i
-#      dh_perl -i
-#      dh_usrlocal -i
-#      dh_link -i
+       dh_installemacsen -i
+       dh_installifupdown -i
+       dh_installinfo -i
+       dh_python2 -i
+       dh_installinit -i
+       dh_installmenu -i
+       dh_installmime -i
+       dh_installmodules -i
+       dh_installlogcheck -i
+       dh_installlogrotate -i
+       dh_installpam -i
+       dh_installppp -i
+       dh_installudev -i
+       dh_installwm -i
+       dh_installxfonts -i
+       dh_bugfiles -i
+       dh_lintian -i
+       dh_gconf -i
+       dh_icons -i
+       dh_perl -i
+       dh_usrlocal -i
+       dh_link -i
        dh_compress -i
        dh_fixperms -i
 #      dh_strip -i
@@ -91,7 +91,7 @@ binary-arch:
        dh_installemacsen -a
        dh_installifupdown -a
        dh_installinfo -a
-       dh_pysupport -a
+       dh_python2 -a
        dh_numpy -a
        dh_installinit -a
        dh_installmenu -a

diff --git a/include/mgl/config.h b/include/mgl/config.h
index 4deae5f45e4741cea5a85a7bce55e6445772b9e9..cc599d2cf33f3ddb20cdfaf0af010d02168257e5 100644 (file)
--- a/include/mgl/config.h
+++ b/include/mgl/config.h
@@ -1,3 +1,3 @@
 /* This define enables double precision in MathGL */
-#define MGL_USE_DOUBLE 0
+#define MGL_USE_DOUBLE 1