[mathgl] 01/02: Fix several bugs
Dimitrios Eftaxiopoulos
eftaxiop-guest at moszumanska.debian.org
Sun Dec 6 18:48:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch master
in repository mathgl.
commit b70278428e5ec2cd9b2a81371d54a04b04d0dd13
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Sun Dec 6 19:35:23 2015 +0200
Fix several bugs
---
.../series => .pc/CMakeLists.patch/.timestamp | 0
.../CMakeLists.patch/CMakeLists.txt | 0
.pc/applied-patches | 3 +
debian/patches/series => .pc/json.patch/.timestamp | 0
{json => .pc/json.patch/json}/Backend.hpp | 0
debian/patches/series => .pc/src.patch/.timestamp | 0
{src => .pc/src.patch/src}/fit.cpp | 0
CMakeLists.txt | 30 +++++-----
debian/changelog | 5 +-
debian/control | 4 +-
debian/mathgl.install | 3 +-
debian/patches/CMakeLists.patch | 68 ++++++++++++++++++++++
debian/patches/json.patch | 9 +++
debian/patches/series | 3 +
debian/patches/src.patch | 11 ++++
json/Backend.hpp | 1 +
src/fit.cpp | 2 +-
17 files changed, 119 insertions(+), 20 deletions(-)
diff --git a/debian/patches/series b/.pc/CMakeLists.patch/.timestamp
similarity index 100%
copy from debian/patches/series
copy to .pc/CMakeLists.patch/.timestamp
diff --git a/CMakeLists.txt b/.pc/CMakeLists.patch/CMakeLists.txt
similarity index 100%
copy from CMakeLists.txt
copy to .pc/CMakeLists.patch/CMakeLists.txt
diff --git a/.pc/applied-patches b/.pc/applied-patches
new file mode 100644
index 0000000..eb1f9d8
--- /dev/null
+++ b/.pc/applied-patches
@@ -0,0 +1,3 @@
+CMakeLists.patch
+src.patch
+json.patch
diff --git a/debian/patches/series b/.pc/json.patch/.timestamp
similarity index 100%
copy from debian/patches/series
copy to .pc/json.patch/.timestamp
diff --git a/json/Backend.hpp b/.pc/json.patch/json/Backend.hpp
similarity index 100%
copy from json/Backend.hpp
copy to .pc/json.patch/json/Backend.hpp
diff --git a/debian/patches/series b/.pc/src.patch/.timestamp
similarity index 100%
copy from debian/patches/series
copy to .pc/src.patch/.timestamp
diff --git a/src/fit.cpp b/.pc/src.patch/src/fit.cpp
similarity index 100%
copy from src/fit.cpp
copy to .pc/src.patch/src/fit.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2f5e46..9c67f3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,14 +95,14 @@ set(MGL_LIB_INSTALL_DIR "lib" CACHE STRING "Set library install directory")
string(TIMESTAMP MGL_NIGHT "%d.%m.%y")
option(enable-double "Enable double precision in MathGL library" ON)
-option(enable-mpi "Enable mpi")
+option(enable-mpi "Enable mpi" ON)
option(enable-opengl "Enable OpenGL support" ON)
option(enable-all-docs "Enable all documentation building")
#option(enable-doc "Enable documentation building")
option(enable-all "Enable all core features")
option(enable-all-widgets "Enable all Widgets")
option(enable-all-swig "Enable all SWIG based interfaces")
-option(enable-rvalue "Enable move constructor support (need C++11)" OFF)
+option(enable-rvalue "Enable move constructor support (need C++11)" ON)
option(enable-pthread "Enable POSIX threads support" OFF)
option(enable-pthr_fltk "Enable POSIX threads for widgets" ON)
option(enable-openmp "Enable OpenMP support" ON)
@@ -113,7 +113,7 @@ endif(enable-pthread AND enable-openmp)
option(enable-lgpl "Enable only LGPL part of MathGL")
option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
-option(enable-ltdl "Enable loading modules support")
+option(enable-ltdl "Enable loading modules support" ON)
CMAKE_DEPENDENT_OPTION(enable-doc-site "Enable HTML documentation for website" OFF "NOT enable-all-docs" ON)
CMAKE_DEPENDENT_OPTION(enable-doc-html "Enable HTML documentation" OFF "NOT enable-all-docs" ON)
CMAKE_DEPENDENT_OPTION(enable-doc-info "Enable INFO documentation" OFF "NOT enable-all-docs" ON)
@@ -126,17 +126,17 @@ CMAKE_DEPENDENT_OPTION(enable-mgltex "Enable installation of mgltex package (MGL
CMAKE_DEPENDENT_OPTION(enable-zlib "Enable zlib support" ON "NOT enable-all" ON)
CMAKE_DEPENDENT_OPTION(enable-png "Enable png support" ON "NOT enable-all" ON)
-CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" OFF "NOT enable-all" ON)
-MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON)
-MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON)
-MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON)
-CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" OFF "NOT enable-all" ON)
-CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" OFF "NOT enable-all" ON)
-CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-all-widgets" ON)
-CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-all-widgets" ON)
-CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-all-widgets" ON)
+CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" ON "NOT enable-all" ON)
+MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" ON "NOT enable-lgpl" ON "NOT enable-all" ON)
+MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON)
+MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON)
+CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" ON "NOT enable-all" ON)
+CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" ON "NOT enable-all" ON)
+CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" ON "NOT enable-all-widgets" ON)
+CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" ON "NOT enable-all-widgets" ON)
+CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" ON "NOT enable-all-widgets" ON)
CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-all-widgets" ON)
-CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-all-widgets" ON)
+CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" ON "NOT enable-all-widgets" ON)
CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF)
if(UNIX AND enable-rvalue)
@@ -150,9 +150,9 @@ set(enable-qt ON)
endif(enable-qt4 OR enable-qt5)
CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" OFF)
-MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
+MGL_DEPENDENT_OPTION(enable-python "Enable python interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
-MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
+MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
MGL_DEPENDENT_OPTION(enable-octave-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
diff --git a/debian/changelog b/debian/changelog
index a5ddf4b..95cc4c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
mathgl (2.3.3+svn1216-1) UNRELEASED; urgency=medium
- * Imported Upstream version 2.3.3+svn1216
+ * Imported Upstream version 2.3.3+svn1216 (Closes: #800460)
+ * Fix GSL-2 use bug - thanks to Bas Couwenberg (Closes: #805801)
+ * Fix Qt related bug -thanks to Peter Green (Closes: #803312)
+ * Enable Octave interface (Closes: #741156)
-- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> Sat, 05 Dec 2015 16:20:20 +0200
diff --git a/debian/control b/debian/control
index 445283c..857da5a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
-Build-Depends: debhelper (>= 9), libltdl-dev, libgsl0-dev, freeglut3-dev,
+Build-Depends: debhelper (>= 9), libltdl-dev, libgsl-dev, freeglut3-dev,
libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-dev, libqt5opengl5-dev,
libjpeg-dev, libtiff-dev, libfltk1.3-dev, libqt5webkit5-dev, libwxgtk3.0-dev,
texinfo, texlive, texlive-generic-recommended, liblua5.1-dev, libxcursor-dev,
@@ -201,7 +201,7 @@ Section: libdevel
Depends: libmgl7.4.0 (= ${binary:Version}), libmgl-wnd7.4.0 (= ${binary:Version}),
libmgl-wx7.4.0 (= ${binary:Version}), libmgl-fltk7.4.0 (= ${binary:Version}),
libmgl-qt7.4.0 (= ${binary:Version}), libmgl-glut7.4.0 (= ${binary:Version}),
- libmgl-mpi7.4.0 (= ${binary:Version}), ${misc:Depends}, libgsl0-dev,
+ libmgl-mpi7.4.0 (= ${binary:Version}), ${misc:Depends}, libgsl-dev,
libgl1-mesa-dev | libgl-dev, libpng-dev
Description: library for scientific graphs (development files)
A free cross-platform library of fast C++ routines for plotting data in up
diff --git a/debian/mathgl.install b/debian/mathgl.install
index ca663af..5260e80 100644
--- a/debian/mathgl.install
+++ b/debian/mathgl.install
@@ -1,2 +1,3 @@
debian/tmp/usr/bin/mgl*
-debian/tmp/usr/share/mathgl/mgl.cgi /usr/bin
\ No newline at end of file
+debian/tmp/usr/share/mathgl/mgl.cgi /usr/bin
+debian/tmp/usr/share/mime/packages/mgl.xml
\ No newline at end of file
diff --git a/debian/patches/CMakeLists.patch b/debian/patches/CMakeLists.patch
new file mode 100644
index 0000000..f852115
--- /dev/null
+++ b/debian/patches/CMakeLists.patch
@@ -0,0 +1,68 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -95,14 +95,14 @@
+ string(TIMESTAMP MGL_NIGHT "%d.%m.%y")
+
+ option(enable-double "Enable double precision in MathGL library" ON)
+-option(enable-mpi "Enable mpi")
++option(enable-mpi "Enable mpi" ON)
+ option(enable-opengl "Enable OpenGL support" ON)
+ option(enable-all-docs "Enable all documentation building")
+ #option(enable-doc "Enable documentation building")
+ option(enable-all "Enable all core features")
+ option(enable-all-widgets "Enable all Widgets")
+ option(enable-all-swig "Enable all SWIG based interfaces")
+-option(enable-rvalue "Enable move constructor support (need C++11)" OFF)
++option(enable-rvalue "Enable move constructor support (need C++11)" ON)
+ option(enable-pthread "Enable POSIX threads support" OFF)
+ option(enable-pthr_fltk "Enable POSIX threads for widgets" ON)
+ option(enable-openmp "Enable OpenMP support" ON)
+@@ -113,7 +113,7 @@
+
+ option(enable-lgpl "Enable only LGPL part of MathGL")
+ option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
+-option(enable-ltdl "Enable loading modules support")
++option(enable-ltdl "Enable loading modules support" ON)
+ CMAKE_DEPENDENT_OPTION(enable-doc-site "Enable HTML documentation for website" OFF "NOT enable-all-docs" ON)
+ CMAKE_DEPENDENT_OPTION(enable-doc-html "Enable HTML documentation" OFF "NOT enable-all-docs" ON)
+ CMAKE_DEPENDENT_OPTION(enable-doc-info "Enable INFO documentation" OFF "NOT enable-all-docs" ON)
+@@ -126,17 +126,17 @@
+
+ CMAKE_DEPENDENT_OPTION(enable-zlib "Enable zlib support" ON "NOT enable-all" ON)
+ CMAKE_DEPENDENT_OPTION(enable-png "Enable png support" ON "NOT enable-all" ON)
+-CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" OFF "NOT enable-all" ON)
+-MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON)
+-MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON)
+-MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON)
+-CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" OFF "NOT enable-all" ON)
+-CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" OFF "NOT enable-all" ON)
+-CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-all-widgets" ON)
+-CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-all-widgets" ON)
+-CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-all-widgets" ON)
++CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" ON "NOT enable-all" ON)
++MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" ON "NOT enable-lgpl" ON "NOT enable-all" ON)
++MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON)
++MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON)
++CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" ON "NOT enable-all" ON)
++CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" ON "NOT enable-all" ON)
++CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" ON "NOT enable-all-widgets" ON)
++CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" ON "NOT enable-all-widgets" ON)
++CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" ON "NOT enable-all-widgets" ON)
+ CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-all-widgets" ON)
+-CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-all-widgets" ON)
++CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" ON "NOT enable-all-widgets" ON)
+ CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF)
+
+ if(UNIX AND enable-rvalue)
+@@ -150,9 +150,9 @@
+ endif(enable-qt4 OR enable-qt5)
+
+ CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" OFF)
+-MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
++MGL_DEPENDENT_OPTION(enable-python "Enable python interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
+ MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
+-MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
++MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
+ MGL_DEPENDENT_OPTION(enable-octave-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
+
+ include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
diff --git a/debian/patches/json.patch b/debian/patches/json.patch
new file mode 100644
index 0000000..6a5f278
--- /dev/null
+++ b/debian/patches/json.patch
@@ -0,0 +1,9 @@
+--- a/json/Backend.hpp
++++ b/json/Backend.hpp
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <QObject>
+ #include <QStringList>
+
+ class Backend : public QObject
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..eb1f9d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+CMakeLists.patch
+src.patch
+json.patch
diff --git a/debian/patches/src.patch b/debian/patches/src.patch
new file mode 100644
index 0000000..7596170
--- /dev/null
+++ b/debian/patches/src.patch
@@ -0,0 +1,11 @@
+--- a/src/fit.cpp
++++ b/src/fit.cpp
+@@ -194,7 +194,7 @@
+ while ( status == GSL_CONTINUE && iter < 500 );
+
+ gsl_matrix *covar = gsl_matrix_alloc(m, m);
+-#ifdef HAVE_GSL_2
++#ifdef MGL_HAVE_GSL2
+ gsl_matrix *J = gsl_matrix_alloc(s->fdf->n, s->fdf->p);
+ gsl_multifit_fdfsolver_jac(s, J);
+ gsl_multifit_covar (J, 0.0, covar);
diff --git a/json/Backend.hpp b/json/Backend.hpp
index 3c7ecbe..33081d6 100644
--- a/json/Backend.hpp
+++ b/json/Backend.hpp
@@ -1,5 +1,6 @@
#pragma once
+#include <QObject>
#include <QStringList>
class Backend : public QObject
diff --git a/src/fit.cpp b/src/fit.cpp
index d4f62e3..56cf1d6 100644
--- a/src/fit.cpp
+++ b/src/fit.cpp
@@ -194,7 +194,7 @@ mreal MGL_NO_EXPORT mgl_fit_base(mglFitData &fd, mreal *ini)
while ( status == GSL_CONTINUE && iter < 500 );
gsl_matrix *covar = gsl_matrix_alloc(m, m);
-#ifdef HAVE_GSL_2
+#ifdef MGL_HAVE_GSL2
gsl_matrix *J = gsl_matrix_alloc(s->fdf->n, s->fdf->p);
gsl_multifit_fdfsolver_jac(s, J);
gsl_multifit_covar (J, 0.0, covar);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathgl.git
More information about the debian-science-commits
mailing list