diff -Nru mathgl-2.4.4/debian/changelog mathgl-2.4.4/debian/changelog --- mathgl-2.4.4/debian/changelog 2020-11-19 17:36:04.000000000 +0000 +++ mathgl-2.4.4/debian/changelog 2020-12-06 08:37:53.000000000 +0000 @@ -1,20 +1,14 @@ -mathgl (2.4.4-6build3) hirsute; urgency=medium +mathgl (2.4.4-7) experimental; urgency=medium - * No-change rebuild to build with python3.9 as default. + * Team upload + * Disable building of the SWIG binding for Octave (Closes: #976381) + * Bump Standards-Version to 4.5.1 (no changes needed) + * Add Rules-Requires-Root: no + * Fix wildcard matches in copyright file + * Add DEP3 headers to the Debian patches + * Bump version of watch file to 4 - -- Matthias Klose Thu, 19 Nov 2020 18:36:04 +0100 - -mathgl (2.4.4-6build2) groovy; urgency=medium - - * No-change rebuild against libhdf5-103-1 - - -- Graham Inggs Wed, 13 May 2020 17:49:08 +0000 - -mathgl (2.4.4-6build1) groovy; urgency=medium - - * No-change rebuild against libgsl25 - - -- Graham Inggs Thu, 07 May 2020 22:16:48 +0000 + -- Rafael Laboissière Sun, 06 Dec 2020 05:37:53 -0300 mathgl (2.4.4-6) unstable; urgency=medium @@ -152,9 +146,9 @@ * New upstream release * Library version numbers updated to soname 7.4.1->7.5.0 - * Standards-Version: 4.0.0 + * Standards-Version: 4.0.0 * Set libmgl-data as M-A: foreign - * Added myself as uploader + * Added myself as uploader -- Alastair McKinstry Wed, 28 Jun 2017 09:27:37 +0100 @@ -253,7 +247,7 @@ * Imported Upstream version 2.2.1+svn921 (Closes: #737110, #737437) * Fix DEP5 lintian error in d/copyright * Disable openmpi support and keep pthread support (Closes: #738540) - * Disable octave interface due to FTBFS + * Disable octave interface due to FTBFS -- Dimitrios Eftaxiopoulos Sun, 23 Feb 2014 19:16:25 +0200 @@ -297,12 +291,12 @@ * Add udav manpage. * Replace octave3.2-headers with liboctave-dev in build deps. * Fix library package names to reflect soname. - * Rename mathgl-doc binary to mathgl-doc-en. + * Rename mathgl-doc binary to mathgl-doc-en. * Fix installation directory in doc-base file mathgl-doc-en. * Fix installation directory of python module and files. * Add udav binary package. * Make build dependency on libhdf5-dev only. - * Add c++ compilation include path for pyconfig.h + * Add c++ compilation include path for pyconfig.h * Fix typo in libmgl-glut6.0.0 package (by D. Haley) (Closes: #698570) * Change soname in libraries from 6 to 7 * Add libmgl-qt7.0.0 library package creation @@ -352,20 +346,20 @@ * Correct typo in mathgl description in debian/control (Closes: #644863). * Try to fix symbols FTBFS on several arches. - * Try to fix symbols FTBFS on several arches. + * Try to fix symbols FTBFS on several arches. -- Dimitrios Eftaxiopoulos Wed, 4 Jan 2012 15:30:00 +0200 mathgl (2~rc1-1) experimental; urgency=low * New experimental upstream release (Closes: #632468). - * No documentation debian packages provided. + * No documentation debian packages provided. -- Dimitrios Eftaxiopoulos Wed, 28 Sep 2011 11:30:00 +0300 mathgl (1.11.2-6) unstable; urgency=low - * Fix FTBFS for sparc (Closes: #642654). + * Fix FTBFS for sparc (Closes: #642654). -- Dimitrios Eftaxiopoulos Mon, 26 Sep 2011 16:23:12 +0300 @@ -386,7 +380,7 @@ mathgl (1.11.2-3) unstable; urgency=low - * Replace libfltk-dev with libfltk1.3-dev | libfltk-dev in debian/control + * Replace libfltk-dev with libfltk1.3-dev | libfltk-dev in debian/control Build-Depends (Closes: #638834). * Ammend symbols files for s390x architecture (Closes: #639492). @@ -501,7 +495,7 @@ mathgl (1.11.0.1-4) unstable; urgency=low - * Create mixed symbols files for amd64 and i386 with tagged symbols + * Create mixed symbols files for amd64 and i386 with tagged symbols (Closes: #610777) -- Dimitrios Eftaxiopoulos Sat, 19 Feb 2011 23:10:00 +0200 @@ -548,9 +542,9 @@ * Update to Debian Policy 3.9.1 * Put myself and D. Haley to the maintainers list. * Comment out parallel-build-png.patch in the debian/patches/series file - since it seems to apply to a texinfo/Makefile.am file that is not + since it seems to apply to a texinfo/Makefile.am file that is not included in the source tree. - * Append package quilt to the build-depends list for the source in the + * Append package quilt to the build-depends list for the source in the debian/control file, in order to fix a lintian error. * Reinstate debian/source/format file with content '3.0 (quilt)'. * Fix Lintian warnings related to manpages. @@ -562,8 +556,8 @@ * New Maintainer (Closes: #564422). Set Maintainer to Debian Science Maintainers . * Convert to '3.0 (quilt)' package source format. Drop quilt framework for - packaging. - * debian/control: + packaging. + * debian/control: - Change Vcs-Browser and Vcs-Git to the debian-science git repository. - Change Section for source package to 'science' as per debian-science group policy. diff -Nru mathgl-2.4.4/debian/control mathgl-2.4.4/debian/control --- mathgl-2.4.4/debian/control 2020-02-27 09:37:10.000000000 +0000 +++ mathgl-2.4.4/debian/control 2020-12-06 08:37:02.000000000 +0000 @@ -4,46 +4,46 @@ Maintainer: Debian Science Maintainers Uploaders: Dimitrios Eftaxiopoulos , Alastair McKinstry -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 12), dh-sequence-python3, - libltdl-dev, - libgsl-dev, + libltdl-dev, + libgsl-dev, freeglut3-dev, - libgl1-mesa-dev | libgl-dev, - libpng-dev, - libhdf5-dev, + libgl1-mesa-dev | libgl-dev, + libpng-dev, + libhdf5-dev, libqt5opengl5-dev, - libjpeg-dev, - libtiff-dev, - libfltk1.3-dev, - python3-dev, - python3-numpy, - qtwebengine5-dev [amd64 arm64 armhf i386 mipsel], + libjpeg-dev, + libtiff-dev, + libfltk1.3-dev, + python3-dev, + python3-numpy, + qtwebengine5-dev [amd64 arm64 armhf i386 mipsel], libwxgtk3.0-gtk3-dev, - texinfo, - texlive, - texlive-plain-generic, - liblua5.1-dev, + texinfo, + texlive, + texlive-plain-generic, + liblua5.1-dev, libxcursor-dev, - libgif-dev, - libfontconfig1-dev, + libgif-dev, + libfontconfig1-dev, libqt5webkit5-dev, - libhdf4-dev, - chrpath, - libxinerama-dev, - libxmu-dev, - libxi-dev, + libhdf4-dev, + chrpath, + libxinerama-dev, + libxmu-dev, + libxi-dev, libhpdf-dev, - mpi-default-dev, + mpi-default-dev, swig, - cmake, - libxft-dev, - liboctave-dev, + cmake, + libxft-dev, fluid -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Homepage: http://mathgl.sourceforge.net/doc_en/Main.html Vcs-Git: https://salsa.debian.org/science-team/mathgl.git Vcs-Browser: https://salsa.debian.org/science-team/mathgl +Rules-Requires-Root: no Package: mathgl Architecture: any @@ -114,7 +114,7 @@ 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, parallel interface enhanced, shared object + This package contains the, parallel interface enhanced, shared object files. Package: libmgl-wnd7.5.0 @@ -132,7 +132,7 @@ . This package contains the window opening related shared object files based on Fltk, Qt and Wx. - + Package: libmgl-glut7.5.0 Architecture: any Section: libs @@ -148,7 +148,7 @@ 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 glut interface shared object files for window + This package contains the glut interface shared object files for window opening. Package: libmgl-qt5-7.5.0 @@ -166,7 +166,7 @@ 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 Qt interface shared object files for window + This package contains the Qt interface shared object files for window opening. Package: libmgl-fltk7.5.0 @@ -182,7 +182,7 @@ 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 fltk interface shared object files for window + This package contains the fltk interface shared object files for window opening. Package: libmgl-wx7.5.0 @@ -198,7 +198,7 @@ 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 wx interface shared object files for window + This package contains the wx interface shared object files for window opening. # Package: mgl-lua @@ -234,7 +234,7 @@ 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, + 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 @@ -243,7 +243,7 @@ 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. + This package contains the development files. Package: python3-mathgl Architecture: any diff -Nru mathgl-2.4.4/debian/copyright mathgl-2.4.4/debian/copyright --- mathgl-2.4.4/debian/copyright 2020-02-27 09:37:10.000000000 +0000 +++ mathgl-2.4.4/debian/copyright 2020-12-06 08:37:10.000000000 +0000 @@ -22,6 +22,19 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +Files: texinfo/* +Copyright: (C) 2008-2012 Alexey Balakin +License: GFDL-NIV-1.2+ + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.2 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover + Texts. A copy of the license is included in the section entitled ``GNU + Free Documentation License.'' + . + On Debian GNU/Linux systems, the complete text of the GNU Free Documentation + License can be found in `/usr/share/common-licenses/GFDL-1.2'. + Files: include/mgl2/abstract.h include/mgl2/addon.h include/mgl2/base_cf.h include/mgl2/base.h include/mgl2/canvas_cf.h include/mgl2/canvas_wnd.h include/mgl2/cont.h include/mgl2/datac_cf.h include/mgl2/datac.h @@ -40,7 +53,7 @@ src/complex_ex.cpp src/complex_io.cpp src/cont.cpp src/crust.cpp src/data.cpp src/data_ex.cpp src/data_gr.cpp src/data_io.cpp src/data_png.cpp src/eval.cpp src/evalc.cpp src/evalp.cpp - src/exec.cpp src/export.cpp src/export_2d.cpp + src/exec_*.cpp src/export.cpp src/export_2d.cpp src/export_3d.cpp src/fft.cpp src/fit.cpp src/font.cpp src/obj.cpp src/other.cpp src/parser.cpp src/pde.cpp src/pixel.cpp @@ -116,19 +129,6 @@ The complete text of the license can be found in `src/s_hull/COPYING.txt'. -Files: texinfo/* -Copyright: (C) 2008-2012 Alexey Balakin -License: GFDL-NIV-1.2+ - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.2 - or any later version published by the Free Software Foundation; - with no Invariant Sections, no Front-Cover Texts, and no Back-Cover - Texts. A copy of the license is included in the section entitled ``GNU - Free Documentation License.'' - . - On Debian GNU/Linux systems, the complete text of the GNU Free Documentation - License can be found in `/usr/share/common-licenses/GFDL-1.2'. - Files: udav/textedit.cpp udav/textedit.h Copyright: (C) 2010 Nokia Corporation and/or its subsidiary(-ies) License: BSD-3-clause diff -Nru mathgl-2.4.4/debian/patches/CMakeLists.patch mathgl-2.4.4/debian/patches/CMakeLists.patch --- mathgl-2.4.4/debian/patches/CMakeLists.patch 2020-02-27 09:37:10.000000000 +0000 +++ mathgl-2.4.4/debian/patches/CMakeLists.patch 2020-12-06 08:37:17.000000000 +0000 @@ -1,3 +1,11 @@ +Description: Enable CMake options + Enable mpi, loading modules support, joeg, gsl, hdf4, hdf5, pdfm, gif + glut, fltk, wxWidget, Qt5, JSON, and Python. +Author: Alastair McKinstry +Forwarded: not-needed +Reviewed-By: Rafael Laboissière +Last-Update: 2020-12-06 + --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,7 +157,7 @@ @@ -49,7 +57,7 @@ # msvc fwprintf print char* for the specifier of "%s" format if(MSVC AND MSVC_VERSION GREATER 1899) -@@ -243,11 +243,11 @@ +@@ -243,9 +243,9 @@ # endif(NOT enable-opengl) endif(enable-qt4 OR enable-qt5) @@ -60,8 +68,5 @@ +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 "Enable octave interface" OFF "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( ${MathGL2_SOURCE_DIR}/include ${MathGL2_BINARY_DIR}/include) diff -Nru mathgl-2.4.4/debian/patches/python3.patch mathgl-2.4.4/debian/patches/python3.patch --- mathgl-2.4.4/debian/patches/python3.patch 2020-02-27 09:37:10.000000000 +0000 +++ mathgl-2.4.4/debian/patches/python3.patch 2020-12-06 08:37:17.000000000 +0000 @@ -1,3 +1,8 @@ +Description: Provide support for python3 interface +Author: Dimitrios Eftaxiopoulos +Forwarded: not-needed +Last-Update: 2019-12-08 + --- a/lang/CMakeLists.txt +++ b/lang/CMakeLists.txt @@ -18,17 +18,17 @@ diff -Nru mathgl-2.4.4/debian/rules mathgl-2.4.4/debian/rules --- mathgl-2.4.4/debian/rules 2020-02-27 09:37:10.000000000 +0000 +++ mathgl-2.4.4/debian/rules 2020-12-06 01:50:01.000000000 +0000 @@ -22,11 +22,11 @@ NODOT:=`py3versions -d | sed 's/\.//' | sed 's/python//' ` %: - dh $@ --buildsystem=cmake + dh $@ --buildsystem=cmake override_dh_auto_configure: dh_auto_configure -- \ - -DPY3VERSION_DOTTED=$(DOTTED) -DPY3VERSION_NODOT=$(NODOT) + -DPY3VERSION_DOTTED=$(DOTTED) -DPY3VERSION_NODOT=$(NODOT) override_dh_python3: dh_numpy3 diff -Nru mathgl-2.4.4/debian/watch mathgl-2.4.4/debian/watch --- mathgl-2.4.4/debian/watch 2020-02-27 09:37:10.000000000 +0000 +++ mathgl-2.4.4/debian/watch 2020-12-06 08:37:29.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 +version=4 http://sf.net/mathgl/mathgl-(.*)\.t(?:ar\.)?gz