Replace octave3.2-headers with liboctave-dev in build deps

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64c3bec7775edca426c62b249bc514c66ed4051b..3c19241eeb2a14f716c92df728d14823f79b87fa 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -238,6 +238,7 @@ endif((enable-langall OR enable-python) AND (NOT enable-lgpl) )
 
 if((enable-langall OR enable-octave) AND (NOT enable-lgpl) )
        set(MGL_HAVE_OCTAVE 1)
+       set(OCTAVE_INCLUDE_DIR "/usr/include/octave-3.6.1")
        find_path(OCTAVE_INCLUDE_DIR octave/oct.h)
        if(NOT OCTAVE_INCLUDE_DIR)
                message(SEND_ERROR "Couldn't find octave/oct.h needed for octave interfaces compiling.")

diff --git a/debian/changelog b/debian/changelog
index 85e39f6e33b12bc826047fed90496470eaf322ea..c06cee7dbfd220264ec1ee59cd5565d6e8ebb358 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mathgl (2~rc2+svn403-1) experimental; urgency=low
+
+  * Updated source from svn repository.
+  * Replace octave3.2-headers with liboctave-dev in build deps.
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Sun, 8 Apr 2012 20:49:00 +0200
+
 mathgl (2~rc2+svn400-1) experimental; urgency=low
 
   * Updated source from svn repository.

diff --git a/debian/control b/debian/control
index 7493ce0ee0f82af9271bb0f10c6608b27ce346ca..f47e0804f26668e660a7eda919ee06e39547ce57 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.2.3~), libltdl-dev, libgsl0-dev, freeglut3-dev,
  libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-dev, swig, cmake, libxft-dev,
  libjpeg-dev, libtiff-dev, libfltk1.3-dev, libqt4-dev, libwxgtk2.8-dev, 
- texinfo, texi2html, texlive, texlive-generic-recommended, octave3.2-headers,
+ texinfo, texi2html, texlive, texlive-generic-recommended, liboctave-dev,
  libgif-dev, python, python-dev, python-numpy, python-support, libfontconfig1-dev,
  libhdf4-dev, chrpath, libxinerama-dev, libxmu-dev, libxi-dev
 Standards-Version: 3.9.3

diff --git a/debian/patches/CMakeLists-txt.patch b/debian/patches/CMakeLists-txt.patch
index f009e908dbacfc92fc605d4d1715538256fd6edc..0cf17d00e230fcd220e33bf7579726b3593ec22b 100644 (file)
--- a/debian/patches/CMakeLists-txt.patch
+++ b/debian/patches/CMakeLists-txt.patch
@@ -45,3 +45,11 @@
  
  include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
  
+@@ -238,6 +238,7 @@
+ 
+ if((enable-langall OR enable-octave) AND (NOT enable-lgpl) )
+       set(MGL_HAVE_OCTAVE 1)
++      set(OCTAVE_INCLUDE_DIR "/usr/include/octave-3.6.1")
+       find_path(OCTAVE_INCLUDE_DIR octave/oct.h)
+       if(NOT OCTAVE_INCLUDE_DIR)
+               message(SEND_ERROR "Couldn't find octave/oct.h needed for octave interfaces compiling.")