+mathgl (2.4.1-2) unstable; urgency=medium
+
+ * Push to unstable. Closes: #868622
+
+ -- Alastair McKinstry <mckinstry@debian.org> Wed, 02 Aug 2017 10:43:55 +0100
+
+mathgl (2.4.1-1) experimental; urgency=medium
+
+ * New upstream release
+ * Remove spurious build-dependency on libtwebkit-dev. Closes: #867297
+
+ -- Alastair McKinstry <mckinstry@debian.org> Tue, 01 Aug 2017 08:52:55 +0100
+
+mathgl (2.4-1) unstable; urgency=medium
+
+ * New upstream release
+ * Library version numbers updated to soname 7.4.1->7.5.0
+ * Standards-Version: 4.0.0
+ * Set libmgl-data as M-A: foreign
+ * Added myself as uploader
+
+ -- Alastair McKinstry <mckinstry@debian.org> Wed, 28 Jun 2017 09:27:37 +0100
+
+mathgl (2.3.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix from Bas Couwenberg for HDF5 build issue. Closes: #835680
+
+ -- Alastair McKinstry <mckinstry@debian.org> Mon, 12 Sep 2016 10:41:06 +0100
+
mathgl (2.3.4-1) unstable; urgency=medium
* Imported Upstream version 2.3.4
Section: science
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
-Uploaders: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
+Uploaders: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>,
+ Alastair McKinstry <mckinstry@debian.org>
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,
- libgif-dev, python-dev, python-numpy, libfontconfig1-dev, libqtwebkit-dev,
+ libgif-dev, python-dev, python-numpy, libfontconfig1-dev,
libhdf4-dev, chrpath, libxinerama-dev, libxmu-dev, libxi-dev, libhpdf-dev,
mpi-default-dev, swig3.0, cmake, libxft-dev, liboctave-dev, fluid
-Standards-Version: 3.9.7
+Standards-Version: 4.0.0
Homepage: http://mathgl.sourceforge.net/doc_en/Main.html
Vcs-Git: https://anonscm.debian.org/debian-science/packages/mathgl.git
Vcs-Browser: https://anonscm.debian.org/gitweb/?p=debian-science/packages/mathgl.git
Package: mathgl
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl7.4.1 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl7.5.0 (= ${binary:Version})
Description: library for scientific graphs (utilities and examples)
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
Package: udav
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl7.4.1 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl7.5.0 (= ${binary:Version})
Description: library for scientific graphs (window interface)
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
# .
# This package contains the MathGL documentation in English.
-Package: libmgl7.4.1
+Package: libmgl7.5.0
Architecture: any
+Multi-Arch: foreign
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
Replaces: libmgl5, libmgl6, libmgl6.0.0, libmgl7.1.0, libmgl7.2.0,
.
This package contains the shared object files.
-Package: libmgl-mpi7.4.1
+Package: libmgl-mpi7.5.0
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
This package contains the, parallel interface enhanced, shared object
files.
-Package: libmgl-wnd7.4.1
+Package: libmgl-wnd7.5.0
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
This package contains the window opening related shared object files based
on Fltk, Qt and Wx.
-Package: libmgl-glut7.4.1
+Package: libmgl-glut7.5.0
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
This package contains the glut interface shared object files for window
opening.
-Package: libmgl-qt5-7.4.1
+Package: libmgl-qt5-7.5.0
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
This package contains the Qt interface shared object files for window
opening.
-Package: libmgl-fltk7.4.1
+Package: libmgl-fltk7.5.0
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
This package contains the fltk interface shared object files for window
opening.
-Package: libmgl-wx7.4.1
+Package: libmgl-wx7.5.0
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
Package: libmgl-dev
Architecture: any
Section: libdevel
-Depends: libmgl7.4.1 (= ${binary:Version}), libmgl-wnd7.4.1 (= ${binary:Version}),
- libmgl-wx7.4.1 (= ${binary:Version}), libmgl-fltk7.4.1 (= ${binary:Version}),
- libmgl-qt5-7.4.1 (= ${binary:Version}), libmgl-glut7.4.1 (= ${binary:Version}),
- libmgl-mpi7.4.1 (= ${binary:Version}), ${misc:Depends}, libgsl-dev,
+Depends: libmgl7.5.0 (= ${binary:Version}), libmgl-wnd7.5.0 (= ${binary:Version}),
+ libmgl-wx7.5.0 (= ${binary:Version}), libmgl-fltk7.5.0 (= ${binary:Version}),
+ libmgl-qt5-7.5.0 (= ${binary:Version}), libmgl-glut7.5.0 (= ${binary:Version}),
+ libmgl-mpi7.5.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
+++ /dev/null
-debian/tmp/usr/lib/libmgl-fltk.so.*
\ No newline at end of file
--- /dev/null
+debian/tmp/usr/lib/libmgl-fltk.so.*
\ No newline at end of file
+++ /dev/null
-debian/tmp/usr/lib/libmgl-glut.so.*
\ No newline at end of file
--- /dev/null
+debian/tmp/usr/lib/libmgl-glut.so.*
\ No newline at end of file
+++ /dev/null
-debian/tmp/usr/lib/libmgl-mpi.so.*
\ No newline at end of file
--- /dev/null
+debian/tmp/usr/lib/libmgl-mpi.so.*
\ No newline at end of file
+++ /dev/null
-debian/tmp/usr/lib/libmgl-qt.so.*
-debian/tmp/usr/lib/libmgl-qt5.so.*
\ No newline at end of file
--- /dev/null
+debian/tmp/usr/lib/libmgl-qt.so.*
+debian/tmp/usr/lib/libmgl-qt5.so.*
\ No newline at end of file
+++ /dev/null
-debian/tmp/usr/lib/libmgl-wnd.so.*
\ No newline at end of file
--- /dev/null
+debian/tmp/usr/lib/libmgl-wnd.so.*
\ No newline at end of file
+++ /dev/null
-debian/tmp/usr/lib/libmgl-wx.so.*
\ No newline at end of file
--- /dev/null
+debian/tmp/usr/lib/libmgl-wx.so.*
\ No newline at end of file
+++ /dev/null
-debian/tmp/usr/lib/libmgl.so.*
\ No newline at end of file
--- /dev/null
+debian/tmp/usr/lib/libmgl.so.*
\ No newline at end of file
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -95,7 +95,7 @@
- string(TIMESTAMP MGL_NIGHT "%d.%m.%y")
+Index: mathgl-2.4/CMakeLists.txt
+===================================================================
+--- mathgl-2.4.orig/CMakeLists.txt
++++ mathgl-2.4/CMakeLists.txt
+@@ -145,7 +145,7 @@ if(WIN32)
+ endif(WIN32)
option(enable-double "Enable double precision in MathGL library" ON)
-option(enable-mpi "Enable mpi")
option(enable-opengl "Enable OpenGL support" ON)
option(enable-all-docs "Enable all documentation building")
#option(enable-doc "Enable documentation building")
-@@ -103,9 +103,9 @@
+@@ -153,9 +153,9 @@ option(enable-all "Enable all core featu
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)
if(enable-pthread AND enable-openmp)
message(SEND_ERROR "You can't enable POSIX threads and OpenMP at the same time!")
-@@ -113,7 +113,7 @@
+@@ -163,7 +163,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)
+ option(enable-doc-site "Enable HTML documentation for website")
+ #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,18 +126,18 @@
+@@ -177,19 +177,19 @@ CMAKE_DEPENDENT_OPTION(enable-mgltex "En
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-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-qt4asqt "Set Qt4 as default libmgl-qt" OFF "enable-qt4" OFF)
-CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-all-widgets" ON)
--CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF)
+-CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" OFF "enable-qt5" OFF)
+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" ON)
++CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF)
- if(UNIX AND enable-rvalue)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-@@ -149,10 +149,10 @@
- set(QT_ENABLED ON)
+ # msvc fwprintf print char* for the specifier of "%s" format
+ if(MSVC AND MSVC_VERSION GREATER 1899)
+@@ -226,11 +226,11 @@ if(enable-qt4 OR enable-qt5)
+ # endif(NOT enable-opengl)
endif(enable-qt4 OR enable-qt5)
--CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "QT_ENABLED" OFF)
+-CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample (WebKit variant is the default)." ON "QT_ENABLED" OFF)
+-CMAKE_DEPENDENT_OPTION(enable-json-sample-we "Enable JSON sample (WebEngine variant)." OFF "enable-json-sample" OFF)
-MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
-+CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "QT_ENABLED" ON)
++CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample (WebKit variant is the default)." ON "QT_ENABLED" ON)
++CMAKE_DEPENDENT_OPTION(enable-json-sample-we "Enable JSON sample (WebEngine variant)." ON "enable-json-sample" 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)
+ include_directories( ${MathGL2_SOURCE_DIR}/include ${MathGL2_BINARY_DIR}/include)
--- /dev/null
+Description: Fix for HDF5 building on cmake > 3.6
+Author: Sebastiaan Couwenberg <sebastic@xs4all.nl>
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835680
+Forwarded: no
+Last-Update: 2016-09-12
+
--- /dev/null
+Index: mathgl-2.4.1/src/canvas.cpp
+===================================================================
+--- mathgl-2.4.1.orig/src/canvas.cpp
++++ mathgl-2.4.1/src/canvas.cpp
+@@ -1219,9 +1219,9 @@ void mglCanvas::Pop()
+ {\r
+ B = stack.back(); \r
+ #if MGL_HAVE_PTHREAD\r
+- pthread_mutex_lock(&m);\r
++ pthread_mutex_lock(&mutexStk);\r
+ stack.pop_back();\r
+- pthread_mutex_unlock(&m);\r
++ pthread_mutex_unlock(&mutexStk);\r
+ #else\r
+ #pragma omp critical(stk)\r
+ stack.pop_back();\r
CMakeLists.patch
+pthread-fix.patch
projects / mathgl.git / commitdiff