From 574499e849e6ecaafd989921853bee4011193829 Mon Sep 17 00:00:00 2001 From: Dimitrios Eftaxiopoulos Date: Sat, 22 Feb 2014 18:26:22 +0200 Subject: [PATCH] Disable octave interface due to FTBFS --- CMakeLists.txt | 20 +-- debian/control | 148 +++++++++--------- ...7.1.0.install => libmgl-fltk7.2.0.install} | 0 ...7.1.0.install => libmgl-glut7.2.0.install} | 0 ...d7.1.0.install => libmgl-wnd7.2.0.install} | 0 ...wx7.1.0.install => libmgl-wx7.2.0.install} | 0 debian/patches/CMakeLists.txt.patch | 32 +++- 7 files changed, 111 insertions(+), 89 deletions(-) rename debian/{libmgl-fltk7.1.0.install => libmgl-fltk7.2.0.install} (100%) rename debian/{libmgl-glut7.1.0.install => libmgl-glut7.2.0.install} (100%) rename debian/{libmgl-wnd7.1.0.install => libmgl-wnd7.2.0.install} (100%) rename debian/{libmgl-wx7.1.0.install => libmgl-wx7.2.0.install} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 74c87b8..62ac421 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,19 +83,19 @@ option(enable-texi2html "Use texi2html (obsolete package) instead of texi2any" O 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-jpeg "Enable jpeg support" OFF "NOT enable-all" ON) -MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) -MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) -MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) -CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" OFF "NOT enable-all" ON) -CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" OFF "NOT enable-all" ON) -MGL_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) -MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) -CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-lgpl" OFF) +CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" ON "NOT enable-all" ON) +MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) +MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) +MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) +CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" ON "NOT enable-all" ON) +CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" ON "NOT enable-all" ON) +MGL_DEPENDENT_OPTION(enable-glut "Enable glut support" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) +MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) +CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" ON "NOT enable-lgpl" OFF) MGL_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) MGL_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF) -MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" 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-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) diff --git a/debian/control b/debian/control index eeb5bb9..c492f2d 100644 --- a/debian/control +++ b/debian/control @@ -84,37 +84,37 @@ Description: library for scientific graphs (mpi enhanced runtime library) This package contains the, parallel interface enhanced, shared object files. -# Package: libmgl-wnd7.1.0 -# Architecture: any -# Section: libs -# Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -# Replaces: libmgl-fltk5, libmgl-wnd6, libmgl-qt5, libmgl-wx5 -# Conflicts: libmgl-fltk5, libmgl-wnd6, libmgl-qt5, libmgl-wx5 -# 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 -# 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 contains the window opening related shared object files based -# on Fltk, Qt and Wx. -# -# Package: libmgl-glut7.1.0 -# Architecture: any -# Section: libs -# Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -# Replaces: libmgl-glut5 -# Conflicts: libmgl-glut5 -# Description: library for scientific graphs (glut 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 -# 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 contains the glut interface shared object files for window -# opening. +Package: libmgl-wnd7.2.0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data +Replaces: libmgl-fltk5, libmgl-wnd6, libmgl-qt5, libmgl-wx5 +Conflicts: libmgl-fltk5, libmgl-wnd6, libmgl-qt5, libmgl-wx5 +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 + 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 contains the window opening related shared object files based + on Fltk, Qt and Wx. + +Package: libmgl-glut7.2.0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data +Replaces: libmgl-glut5 +Conflicts: libmgl-glut5 +Description: library for scientific graphs (glut 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 + 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 contains the glut interface shared object files for window + opening. Package: libmgl-qt7.2.0 Architecture: any @@ -132,37 +132,37 @@ Description: library for scientific graphs (Qt interface for windows) This package contains the Qt interface shared object files for window opening. -# Package: libmgl-fltk7.1.0 -# Architecture: any -# Section: libs -# Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -# Replaces: libmgl-fltk5 -# Conflicts: libmgl-fltk5 -# 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 -# 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 contains the fltk interface shared object files for window -# opening. -# -# Package: libmgl-wx7.1.0 -# Architecture: any -# Section: libs -# Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -# Replaces: libmgl-wx5 -# Conflicts: libmgl-wx5 -# 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 -# 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 contains the wx interface shared object files for window -# opening. +Package: libmgl-fltk7.2.0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data +Replaces: libmgl-fltk5 +Conflicts: libmgl-fltk5 +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 + 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 contains the fltk interface shared object files for window + opening. + +Package: libmgl-wx7.2.0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data +Replaces: libmgl-wx5 +Conflicts: libmgl-wx5 +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 + 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 contains the wx interface shared object files for window + opening. # Package: libmgl-lua7.1.0 # Architecture: any @@ -207,15 +207,15 @@ Description: library for scientific graphs (development files) . This package contains the development files. -# Package: python-mathgl -# Architecture: any -# Section: python -# Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-numpy -# 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. -# 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 module for mathgl. \ No newline at end of file +Package: python-mathgl +Architecture: any +Section: python +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-numpy +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. + 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 module for mathgl. \ No newline at end of file diff --git a/debian/libmgl-fltk7.1.0.install b/debian/libmgl-fltk7.2.0.install similarity index 100% rename from debian/libmgl-fltk7.1.0.install rename to debian/libmgl-fltk7.2.0.install diff --git a/debian/libmgl-glut7.1.0.install b/debian/libmgl-glut7.2.0.install similarity index 100% rename from debian/libmgl-glut7.1.0.install rename to debian/libmgl-glut7.2.0.install diff --git a/debian/libmgl-wnd7.1.0.install b/debian/libmgl-wnd7.2.0.install similarity index 100% rename from debian/libmgl-wnd7.1.0.install rename to debian/libmgl-wnd7.2.0.install diff --git a/debian/libmgl-wx7.1.0.install b/debian/libmgl-wx7.2.0.install similarity index 100% rename from debian/libmgl-wx7.1.0.install rename to debian/libmgl-wx7.2.0.install diff --git a/debian/patches/CMakeLists.txt.patch b/debian/patches/CMakeLists.txt.patch index 268bb38..f4d0d0f 100644 --- a/debian/patches/CMakeLists.txt.patch +++ b/debian/patches/CMakeLists.txt.patch @@ -19,12 +19,34 @@ 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") -@@ -92,7 +92,7 @@ - MGL_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) - MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) - CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-lgpl" OFF) +@@ -83,19 +83,19 @@ + + 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-jpeg "Enable jpeg support" OFF "NOT enable-all" ON) +-MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) +-MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) +-MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) +-CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" OFF "NOT enable-all" ON) +-CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" OFF "NOT enable-all" ON) +-MGL_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) +-MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) +-CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-lgpl" OFF) -MGL_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) ++CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" ON "NOT enable-all" ON) ++MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) ++MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) ++MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) ++CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" ON "NOT enable-all" ON) ++CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" ON "NOT enable-all" ON) ++MGL_DEPENDENT_OPTION(enable-glut "Enable glut support" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) ++MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) ++CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" ON "NOT enable-lgpl" OFF) +MGL_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) MGL_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON) CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF) - MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) +-MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" 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-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) -- 2.30.2