Built without docs and python module

diff --git a/CMakeLists.txt b/CMakeLists.txt
index acb96ba7ba6edd9167c814a8c0f1a422e40db2ed..01a9fee1d9acfce584253f070d484560feb75fbd 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" 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-lgpl "Enable only LGPL part of MathGL" OFF)
-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-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-u3d "Enable u3d support")
 option(enable-pdf "Enable pdf support")
-option(enable-gif "Enable gif support" ON)
-option(enable-hdf4 "Enable hdf4 support" ON)
+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-opengl "Enable OpenGL support" ON)
-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-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")
 if(enable-double)
        set(use_double 1)

diff --git a/debian/changelog b/debian/changelog
index ffb3242d486d32c5fe7636cb761b9a2f011be746..08c6d7df1de45227ebf2089cbe8d99a5403fe368 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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
+
 mathgl (2~rc2+svn362-1) experimental; urgency=low
 
   * Updated source from svn repository.

diff --git a/debian/control b/debian/control
index 130f824d010b462f1b6fc36c1a10a3c4cdf07409..804d9c297f73224556ea546bcba0cd7e396731fd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -28,34 +28,6 @@ Description: library for scientific graphs. (utilities and examples)
  .
  This package contains MathGL utilities and examples.
 
-Package: mathgl-doc-en
-Architecture: all
-Section: doc
-Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}
-Replaces: mathgl-doc
-Description: library for scientific graphs. (English documentation)
- A free cross-platform library of fast C++ routines for plotting data in up
- to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF
- files. There are simple window interfaces based on GLUT, FLTK and/or Qt.
- MathGL can also be used in the console. There are interfaces to a set of
- languages, such as, C, Fortran, Pascal, Forth, Python, Octave.
- .
- This package contains the MathGL documentation in English.
-
-Package: mathgl-doc-ru
-Architecture: all
-Section: doc
-Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}
-Replaces: mathgl-doc
-Description: library for scientific graphs. (Russian documentation)
- A free cross-platform library of fast C++ routines for plotting data in up
- to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF
- files. There are simple window interfaces based on GLUT, FLTK and/or Qt.
- MathGL can also be used in the console. There are interfaces to a set of
- languages, such as, C, Fortran, Pascal, Forth, Python, Octave.
- .
- This package contains the MathGL documentation in Russian.
-
 Package: libmgl6
 Architecture: any
 Section: libs
@@ -108,17 +80,3 @@ Description: library for scientific graphs. (development files)
  languages, such as, C, Fortran, Pascal, Forth, Python, Octave.
  .
  This package contains the development files. 
-
-
-Package: python-mathgl
-Architecture: any
-Section: python
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-numpy-abi9
-Description: library for scientific graphs. (Python module)
- A free cross-platform library of fast C++ routines for plotting data in up
- to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF
- files. There are simple window interfaces based on GLUT, FLTK and/or Qt.
- MathGL can also be used in the console. There are interfaces to a set of
- languages, such as, C, Fortran, Pascal, Forth, Python, Octave.
- .
- This package provides the Python module for mathgl.
\ No newline at end of file

diff --git a/debian/patches/CMakeLists-txt.patch b/debian/patches/CMakeLists-txt.patch
deleted file mode 100644 (file)
index 5961df4..0000000
--- a/debian/patches/CMakeLists-txt.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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-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-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-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")
- if(enable-double)
-       set(use_double 1)

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

diff --git a/debian/rules b/debian/rules
index db6281d3abc9f5e2fcd022b5570837029ad89384..3ffcb9656e6a5e53246d2e8fe916f21c9c98fd38 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ binary-indep:
        dh_testroot -i
        dh_prep -i
        dh_installdirs -i
-       dh_auto_install -i
+       dh_auto_install -i --buildsystem=cmake
        dh_install -i
        dh_installdocs -i
        dh_installchangelogs -i

diff --git a/include/mgl/config.h b/include/mgl/config.h
index cc599d2cf33f3ddb20cdfaf0af010d02168257e5..4deae5f45e4741cea5a85a7bce55e6445772b9e9 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 1
+#define MGL_USE_DOUBLE 0