From 22549aea27de9db27715489f44a59db142daedf0 Mon Sep 17 00:00:00 2001 From: Dimitrios Eftaxiopoulos Date: Mon, 9 Apr 2012 11:17:13 +0300 Subject: [PATCH] Replace octave3.2-headers with liboctave-dev in build deps --- CMakeLists.txt | 1 + debian/changelog | 7 +++++++ debian/control | 2 +- debian/patches/CMakeLists-txt.patch | 8 ++++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 64c3bec..3c19241 100644 --- 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 85e39f6..c06cee7 100644 --- 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 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 7493ce0..f47e080 100644 --- 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 f009e90..0cf17d0 100644 --- 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.") -- 2.30.2