Disable octave interface due to FTBFS

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74c87b8e0cc693503af910cc27594c0ab5357147..62ac4217146ded9d67d8d77d8bb7cdaeb19b5125 100644 (file)
--- 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 eeb5bb983c15cede39328fb346bd7b1fd17d3c52..c492f2dfc6c9fec65b5db2d7ea5b64e48a3cdce8 100644 (file)
--- 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.1.0.install
deleted file mode 100644 (file)
index 8ccf313..0000000
--- a/debian/libmgl-fltk7.1.0.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.2.0.install b/debian/libmgl-fltk7.2.0.install
new file mode 100644 (file)
index 0000000..8ccf313
--- /dev/null
+++ b/debian/libmgl-fltk7.2.0.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libmgl-fltk.so.*
\ No newline at end of file

diff --git a/debian/libmgl-glut7.1.0.install b/debian/libmgl-glut7.1.0.install
deleted file mode 100644 (file)
index 68de839..0000000
--- a/debian/libmgl-glut7.1.0.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.2.0.install b/debian/libmgl-glut7.2.0.install
new file mode 100644 (file)
index 0000000..68de839
--- /dev/null
+++ b/debian/libmgl-glut7.2.0.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libmgl-glut.so.*
\ No newline at end of file

diff --git a/debian/libmgl-wnd7.1.0.install b/debian/libmgl-wnd7.1.0.install
deleted file mode 100644 (file)
index f9595a3..0000000
--- a/debian/libmgl-wnd7.1.0.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.2.0.install b/debian/libmgl-wnd7.2.0.install
new file mode 100644 (file)
index 0000000..f9595a3
--- /dev/null
+++ b/debian/libmgl-wnd7.2.0.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libmgl-wnd.so.*
\ No newline at end of file

diff --git a/debian/libmgl-wx7.1.0.install b/debian/libmgl-wx7.1.0.install
deleted file mode 100644 (file)
index d6b927f..0000000
--- a/debian/libmgl-wx7.1.0.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.2.0.install b/debian/libmgl-wx7.2.0.install
new file mode 100644 (file)
index 0000000..d6b927f
--- /dev/null
+++ b/debian/libmgl-wx7.2.0.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libmgl-wx.so.*
\ No newline at end of file

diff --git a/debian/patches/CMakeLists.txt.patch b/debian/patches/CMakeLists.txt.patch
index 268bb38b1ee13767e98aeef300238cb5d2f8466c..f4d0d0f2ff0dceb7315fa5a3a49343e30132e30c 100644 (file)
--- 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)