From fa5a48bfe15dd03e012b33790c0bc8e99b643fc1 Mon Sep 17 00:00:00 2001 From: Alastair McKinstry Date: Sat, 20 Apr 2019 09:58:22 +0100 Subject: [PATCH] Standards-Version: 4.3.0 --- debian/changelog | 2 ++ debian/control | 38 ++++++++++++++------------------------ debian/patches/series | 2 +- debian/rules | 6 +----- 4 files changed, 18 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d7157c..4372512 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ 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. + * Standards-Version: 4.3.0 + * Simplify d/control Conflicts/Replaces, removing packages before oldstable -- Alastair McKinstry Wed, 27 Mar 2019 14:44:55 +0000 diff --git a/debian/control b/debian/control index 19ee42b..b30cbec 100644 --- a/debian/control +++ b/debian/control @@ -7,13 +7,13 @@ Uploaders: Dimitrios Eftaxiopoulos , Build-Depends: debhelper (>= 11), libltdl-dev, libgsl-dev, freeglut3-dev, libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-dev, libqt5opengl5-dev, libjpeg-dev, libtiff-dev, libfltk1.3-dev, + python3-dev, python3-numpy, dh-python, qtwebengine5-dev [amd64 arm64 armhf i386 mipsel], libwxgtk3.0-dev, texinfo, texlive, texlive-generic-recommended, liblua5.1-dev, libxcursor-dev, - libgif-dev, python3-dev, python3-numpy, libfontconfig1-dev, libqt5webkit5-dev, + libgif-dev, libfontconfig1-dev, libqt5webkit5-dev, libhdf4-dev, chrpath, libxinerama-dev, libxmu-dev, libxi-dev, libhpdf-dev, - mpi-default-dev, swig3.0, cmake, libxft-dev, liboctave-dev, fluid, python-dev, - python-numpy -Standards-Version: 4.2.1.5 + mpi-default-dev, swig3.0, cmake, libxft-dev, liboctave-dev, fluid +Standards-Version: 4.3.0 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 @@ -63,10 +63,8 @@ Package: libmgl7.5.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -Replaces: libmgl5, libmgl6, libmgl6.0.0, libmgl7.1.0, libmgl7.2.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 +Replaces: libmgl7.4.1 +Conflicts: 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 @@ -81,10 +79,8 @@ Package: libmgl-mpi7.5.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -Replaces: libmgl-mpi7.0.0, libmgl-mpi7.1.0, libmgl-mpi7.2.0, - libmgl-mpi7.4.0, libmgl-mpi7.4.1 -Conflicts: libmgl-mpi7.0.0, libmgl-mpi7.1.0, libmgl-mpi7.2.0, - libmgl-mpi7.4.0, libmgl-mpi7.4.1 +Replaces: libmgl-mpi7.4.1 +Conflicts: libmgl-mpi7.4.1 Description: library for scientific graphs (mpi enhanced 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 @@ -99,10 +95,8 @@ Package: libmgl-wnd7.5.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -Replaces: libmgl-fltk5, libmgl-wnd6, libmgl-qt5, libmgl-wx5, libmgl-wnd6.0.0, - libmgl-wnd7.1.0, libmgl-wnd7.2.0, libmgl-wnd7.4.0, libmgl-wnd7.4.1 -Conflicts: libmgl-fltk5, libmgl-wnd6, libmgl-qt5, libmgl-wx5, libmgl-wnd6.0.0, - libmgl-wnd7.1.0, libmgl-wnd7.2.0, libmgl-wnd7.4.0, libmgl-wnd7.4.1 +Replaces: libmgl-fltk5, libmgl-wnd6, libmgl-qt5, libmgl-wx5, libmgl-wnd7.4.1 +Conflicts: libmgl-fltk5, libmgl-wnd6, libmgl-qt5, libmgl-wx5, libmgl-wnd7.4.1 Description: library for scientific graphs (windows 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 @@ -153,10 +147,8 @@ Package: libmgl-fltk7.5.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -Replaces: libmgl-fltk5, libmgl-fltk7.1.0, libmgl-fltk7.2.0, libmgl-fltk7.4.0, - libmgl-fltk7.4.1 -Conflicts: libmgl-fltk5, libmgl-fltk7.1.0, libmgl-fltk7.2.0, libmgl-fltk7.4.0, - libmgl-fltk7.4.1 +Replaces: libmgl-fltk7.4.1 +Conflicts: libmgl-fltk7.4.1 Description: library for scientific graphs (fltk interface for windows) 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 @@ -171,10 +163,8 @@ Package: libmgl-wx7.5.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -Replaces: libmgl-wx5, libmgl-wx7.1.0, libmgl-wx7.2.0, libmgl-wx7.4.0, - libmgl-wx7.4.1 -Conflicts: libmgl-wx5, libmgl-wx7.1.0, libmgl-wx7.2.0, libmgl-wx7.4.0, - libmgl-wx7.4.1 +Replaces: libmgl-wx7.4.1 +Conflicts: libmgl-wx7.4.1 Description: library for scientific graphs (wx interface for windows) 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 diff --git a/debian/patches/series b/debian/patches/series index 33a8c44..c8e77bc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ python2_and_python3.patch -pthread-fix.patch +CMakeLists.patch diff --git a/debian/rules b/debian/rules index 3479fa1..1d67c49 100755 --- a/debian/rules +++ b/debian/rules @@ -20,15 +20,11 @@ DOTTED:=`py3versions -d | sed 's/python//' ` NODOT:=`py3versions -d | sed 's/\.//' | sed 's/python//' ` %: - dh $@ --buildsystem=cmake --with python2,python3 - + dh $@ --buildsystem=cmake --with python3 override_dh_auto_configure: dh_auto_configure -- \ -DPY3VERSION_DOTTED=$(DOTTED) -DPY3VERSION_NODOT=$(NODOT) -override_dh_python2: - dh_numpy - override_dh_python3: dh_numpy3 -- 2.30.2