From: Alastair McKinstry Date: Wed, 4 Oct 2017 14:21:19 +0000 (+0100) Subject: Merge missing debian changes X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~77^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cfaaa3be7b5a720d8c99959c4119a0ac447dacac;p=mathgl.git Merge missing debian changes --- diff --git a/debian/changelog b/debian/changelog index 82af46b..8415138 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +mathgl (2.4.1-2) unstable; urgency=medium + + * Push to unstable. Closes: #868622 + + -- Alastair McKinstry 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 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 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 Mon, 12 Sep 2016 10:41:06 +0100 + mathgl (2.3.4-1) unstable; urgency=medium * Imported Upstream version 2.3.4 diff --git a/debian/control b/debian/control index 74a0db6..e7a397a 100644 --- a/debian/control +++ b/debian/control @@ -2,15 +2,16 @@ Source: mathgl Section: science Priority: optional Maintainer: Debian Science Maintainers -Uploaders: Dimitrios Eftaxiopoulos +Uploaders: Dimitrios Eftaxiopoulos , + Alastair McKinstry 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 @@ -18,7 +19,7 @@ Vcs-Browser: https://anonscm.debian.org/gitweb/?p=debian-science/packages/mathgl 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 @@ -31,7 +32,7 @@ Description: library for scientific graphs (utilities and examples) 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 @@ -56,8 +57,9 @@ Description: library for scientific graphs (window interface) # . # 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, @@ -73,7 +75,7 @@ Description: library for scientific graphs (main runtime library) . 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 @@ -89,7 +91,7 @@ Description: library for scientific graphs (mpi enhanced runtime library) 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 @@ -107,7 +109,7 @@ Description: library for scientific graphs (windows runtime library) 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 @@ -125,7 +127,7 @@ Description: library for scientific graphs (glut interface for windows) 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 @@ -141,7 +143,7 @@ Description: library for scientific graphs (Qt interface for windows) 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 @@ -157,7 +159,7 @@ Description: library for scientific graphs (fltk interface for windows) 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 @@ -202,10 +204,10 @@ Description: library for scientific graphs (data files) 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 diff --git a/debian/libmgl-fltk7.4.1.install b/debian/libmgl-fltk7.4.1.install deleted file mode 100644 index 8ccf313..0000000 --- a/debian/libmgl-fltk7.4.1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libmgl-fltk.so.* \ No newline at end of file diff --git a/debian/libmgl-fltk7.5.0.install b/debian/libmgl-fltk7.5.0.install new file mode 100644 index 0000000..8ccf313 --- /dev/null +++ b/debian/libmgl-fltk7.5.0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libmgl-fltk.so.* \ No newline at end of file diff --git a/debian/libmgl-glut7.4.1.install b/debian/libmgl-glut7.4.1.install deleted file mode 100644 index 68de839..0000000 --- a/debian/libmgl-glut7.4.1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libmgl-glut.so.* \ No newline at end of file diff --git a/debian/libmgl-glut7.5.0.install b/debian/libmgl-glut7.5.0.install new file mode 100644 index 0000000..68de839 --- /dev/null +++ b/debian/libmgl-glut7.5.0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libmgl-glut.so.* \ No newline at end of file diff --git a/debian/libmgl-mpi7.4.1.install b/debian/libmgl-mpi7.4.1.install deleted file mode 100644 index b90da4d..0000000 --- a/debian/libmgl-mpi7.4.1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libmgl-mpi.so.* \ No newline at end of file diff --git a/debian/libmgl-mpi7.5.0.install b/debian/libmgl-mpi7.5.0.install new file mode 100644 index 0000000..b90da4d --- /dev/null +++ b/debian/libmgl-mpi7.5.0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libmgl-mpi.so.* \ No newline at end of file diff --git a/debian/libmgl-qt5-7.4.1.install b/debian/libmgl-qt5-7.4.1.install deleted file mode 100644 index 5a60566..0000000 --- a/debian/libmgl-qt5-7.4.1.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/libmgl-qt.so.* -debian/tmp/usr/lib/libmgl-qt5.so.* \ No newline at end of file diff --git a/debian/libmgl-qt5-7.5.0.install b/debian/libmgl-qt5-7.5.0.install new file mode 100644 index 0000000..5a60566 --- /dev/null +++ b/debian/libmgl-qt5-7.5.0.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libmgl-qt.so.* +debian/tmp/usr/lib/libmgl-qt5.so.* \ No newline at end of file diff --git a/debian/libmgl-wnd7.4.1.install b/debian/libmgl-wnd7.4.1.install deleted file mode 100644 index f9595a3..0000000 --- a/debian/libmgl-wnd7.4.1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libmgl-wnd.so.* \ No newline at end of file diff --git a/debian/libmgl-wnd7.5.0.install b/debian/libmgl-wnd7.5.0.install new file mode 100644 index 0000000..f9595a3 --- /dev/null +++ b/debian/libmgl-wnd7.5.0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libmgl-wnd.so.* \ No newline at end of file diff --git a/debian/libmgl-wx7.4.1.install b/debian/libmgl-wx7.4.1.install deleted file mode 100644 index d6b927f..0000000 --- a/debian/libmgl-wx7.4.1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libmgl-wx.so.* \ No newline at end of file diff --git a/debian/libmgl-wx7.5.0.install b/debian/libmgl-wx7.5.0.install new file mode 100644 index 0000000..d6b927f --- /dev/null +++ b/debian/libmgl-wx7.5.0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libmgl-wx.so.* \ No newline at end of file diff --git a/debian/libmgl7.4.1.install b/debian/libmgl7.4.1.install deleted file mode 100644 index 248a51b..0000000 --- a/debian/libmgl7.4.1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libmgl.so.* \ No newline at end of file diff --git a/debian/libmgl7.5.0.install b/debian/libmgl7.5.0.install new file mode 100644 index 0000000..248a51b --- /dev/null +++ b/debian/libmgl7.5.0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libmgl.so.* \ No newline at end of file diff --git a/debian/patches/CMakeLists.patch b/debian/patches/CMakeLists.patch index 97c907a..ff19a4c 100644 --- a/debian/patches/CMakeLists.patch +++ b/debian/patches/CMakeLists.patch @@ -1,7 +1,9 @@ ---- 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") @@ -9,7 +11,7 @@ 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) @@ -21,16 +23,16 @@ 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) @@ -53,24 +55,27 @@ +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) diff --git a/debian/patches/fix_hdf5.patch b/debian/patches/fix_hdf5.patch new file mode 100644 index 0000000..ead57d6 --- /dev/null +++ b/debian/patches/fix_hdf5.patch @@ -0,0 +1,7 @@ +Description: Fix for HDF5 building on cmake > 3.6 +Author: Sebastiaan Couwenberg +Origin: , +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835680 +Forwarded: no +Last-Update: 2016-09-12 + diff --git a/debian/patches/pthread-fix.patch b/debian/patches/pthread-fix.patch new file mode 100644 index 0000000..8f54691 --- /dev/null +++ b/debian/patches/pthread-fix.patch @@ -0,0 +1,16 @@ +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() + { + B = stack.back(); + #if MGL_HAVE_PTHREAD +- pthread_mutex_lock(&m); ++ pthread_mutex_lock(&mutexStk); + stack.pop_back(); +- pthread_mutex_unlock(&m); ++ pthread_mutex_unlock(&mutexStk); + #else + #pragma omp critical(stk) + stack.pop_back(); diff --git a/debian/patches/series b/debian/patches/series index 879efc6..76861c9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ CMakeLists.patch +pthread-fix.patch