From: Alastair McKinstry Date: Sat, 20 Apr 2019 07:05:52 +0000 (+0100) Subject: Merge branch 'debian/master' X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~58 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bed98ce030ee8b19a6daa10cd8fe678aacc57a72;p=mathgl.git Merge branch 'debian/master' --- bed98ce030ee8b19a6daa10cd8fe678aacc57a72 diff --cc debian/changelog index a50a3c4,f4fdfda..0d7157c --- a/debian/changelog +++ b/debian/changelog @@@ -1,57 -1,11 +1,65 @@@ + mathgl (2.4.3-1) UNRELEASED; urgency=medium + + * New upstream release + * Enable OpenMP support. clang now supports this. + * Update VCS-* references to salsa.debian.org. + + -- Alastair McKinstry Wed, 27 Mar 2019 14:44:55 +0000 + +mathgl (2.4.2.1-5) unstable; urgency=medium + + * Try to fix FTBFS on mips and mipsel arches (Closes: #915506) + + -- Dimitrios Eftaxiopoulos Tue, 04 Dec 2018 17:58:19 +0200 + +mathgl (2.4.2.1-4) unstable; urgency=medium + + [ Jelmer Vernooij ] + * Trim trailing whitespace. Fixed-Lintian-Tags: + file-contains-trailing-whitespace + * Use secure copyright file specification URI. Fixed-Lintian-Tags: + insecure-copyright-format-uri + + [ Dimitrios Eftaxiopoulos ] + * Restrict qtwebengine5-dev B-D to the arches where it is available + (Closes: #914585) + + -- Dimitrios Eftaxiopoulos Sun, 25 Nov 2018 22:19:06 +0200 + +mathgl (2.4.2.1-3) unstable; urgency=medium + + * Fix FTBFS with python3.7. Closes: #912590 + + -- Alastair McKinstry Thu, 01 Nov 2018 17:17:49 +0000 + +mathgl (2.4.2.1-2) unstable; urgency=medium + + * Add qtwebengine5-dev to Build-Depends due to the output of cmake + * Update standards version to 4.1.4 + * Add Replaces/Conflicts for libmgl-*7.4.1 library packages + * Provide both python2 and python3 modules, using patch from Fedora project + * Mark libmgl-data as Multi-Arch: foreign (Closes: #897619) + + -- Dimitrios Eftaxiopoulos Sat, 23 Jun 2018 00:33:48 +0300 + +mathgl (2.4.2.1-1) unstable; urgency=medium + + * New upstream version 2.4.2.1 + + -- Dimitrios Eftaxiopoulos Wed, 04 Apr 2018 01:00:32 +0300 + +mathgl (2.4.2-1) unstable; urgency=medium + + * New upstream version 2.4.2 + * Remove M-A header from libmgl7.5.0 library (Closes: #872205) + * Refresh patch CMakeLists.patch + * Remove no more needed patches fix_hdf5.patch and pthread-fix.patch + * Update Standards-Version to current Policy version 4.1.3 + * Update Vcs fields so that they point to salsa.d.o in d/control + * Update debhelper version and compat level to 11 + + -- Dimitrios Eftaxiopoulos Tue, 03 Apr 2018 18:09:20 +0300 + mathgl (2.4.1-2) unstable; urgency=medium * Push to unstable. Closes: #868622 @@@ -268,7 -222,7 +276,8 @@@ mathgl (2~rc1-3) experimental; urgency= mathgl (2~rc1-2) experimental; urgency=low * 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. -- Dimitrios Eftaxiopoulos Wed, 4 Jan 2012 15:30:00 +0200 diff --cc debian/control index 12b5a26,9459b73..19ee42b --- a/debian/control +++ b/debian/control @@@ -64,9 -62,10 +64,10 @@@ Architecture: an Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data Replaces: libmgl5, libmgl6, libmgl6.0.0, libmgl7.1.0, libmgl7.2.0, - libmgl7.4.0 -Conflicts: libmgl5, libmgl6, libmgl6.0.0, libmgl7.1.0, libmgl7.2.0, - libmgl7.4.0 + libmgl7.4.0, libmgl7.4.1 +Conflicts: libmgl5, libmgl6, libmgl6.0.0, libmgl7.1.0, libmgl7.2.0, + libmgl7.4.0, libmgl7.4.1 ++Multi-Arch: foreign Description: library for scientific graphs (main runtime library) 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 @@@ -226,28 -216,13 +227,14 @@@ Description: library for scientific gra 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. - - Package: python-mathgl - Architecture: any - Section: python - Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python, - python-numpy - Description: library for scientific graphs (Python v.2 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 v.2 module for mathgl. + This package contains the development files. -Package: python-mathgl +Package: python3-mathgl Architecture: any Section: python -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-numpy +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3, + python3-numpy - Description: library for scientific graphs (Python v.3 module) + 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. diff --cc debian/patches/series index 7248928,76861c9..33a8c44 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,2 -1,2 +1,2 @@@ --CMakeLists.patch +python2_and_python3.patch + pthread-fix.patch diff --cc debian/python-mathgl.install index 676c8f0,430c254..9242301 --- a/debian/python-mathgl.install +++ b/debian/python-mathgl.install @@@ -1,2 -1,2 +1,2 @@@ - debian/tmp/usr/lib/python2*/dist-packages/*.so - debian/tmp/usr/lib/python2*/dist-packages/*.py + debian/tmp/usr/lib/python*/dist-packages/*.so -debian/tmp/usr/lib/python*/dist-packages/*.py ++debian/tmp/usr/lib/python*/dist-packages/*.py