Enable all features (but u3d) during build

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f1c281df42b8a8c9f3fc74bfba262d0b6ca6a00..1cf3401a9efbafe94c068b14c8cb7a69231740a7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,28 +2,28 @@ 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-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-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" OFF)
+option(enable-pdf "Enable pdf support" OFF)
+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-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)
 if(enable-double)
        set(use_double 1)
 endif(enable-double)

diff --git a/debian/control b/debian/control
index 693e7b5c33f5c0570bc0bc07d30c6259c371b859..130f824d010b462f1b6fc36c1a10a3c4cdf07409 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, octave3.2-headers,
  libgif-dev, python, python-dev, python-numpy, python-support, libfontconfig1-dev,
- libhdf4-dev, chrpath, libxinerama-dev 
+ libhdf4-dev, chrpath, libxinerama-dev, libxmu-dev, libxi-dev
 Standards-Version: 3.9.3
 Homepage: http://mathgl.sourceforge.net/index.html
 Vcs-Git: git://git.debian.org/debian-science/packages/mathgl.git
@@ -28,6 +28,34 @@ 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
@@ -79,4 +107,18 @@ Description: library for scientific graphs. (development files)
  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 development files. 
\ No newline at end of file
+ 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
new file mode 100644 (file)
index 0000000..50908c0
--- /dev/null
+++ b/debian/patches/CMakeLists-txt.patch
@@ -0,0 +1,50 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,28 +2,28 @@
+ 
+ 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-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-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" OFF)
++option(enable-pdf "Enable pdf support" OFF)
++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-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)
+ if(enable-double)
+       set(use_double 1)
+ endif(enable-double)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..4277de1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+CMakeLists-txt.patch

diff --git a/debian/rules b/debian/rules
index 881d51b1d689dd08dc35efe26e5fd30c1f7ba2f8..0ed911d41a8c3cfd1b9ed907d54f0cadbfa88455 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ build-stamp:
        dh_testdir
        dh_auto_configure --buildsystem=cmake
        dh_auto_build --buildsystem=cmake
-#      dh_auto_test
+       dh_auto_test
 
 binary-indep:
        dh_testroot -i