[mathgl] 01/01: Add libqt5opengl5-dev and libxcursor-dev to BD to achieve build in a sid chroot
Dimitrios Eftaxiopoulos
eftaxiop-guest at moszumanska.debian.org
Sat Aug 8 17:33:29 UTC 2015
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch master
in repository mathgl.
commit 75da7b4f5a20c45fc9e986d75b2c354429c7b317
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Sat Aug 8 20:21:40 2015 +0300
Add libqt5opengl5-dev and libxcursor-dev to BD to achieve build in a sid chroot
---
CMakeLists.txt | 2 +-
debian/control | 6 +++---
debian/patches/CMakeLists.patch | 9 +++++++++
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d42271c..e73b54b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,7 @@ set(enable-qt ON)
endif(enable-qt4 OR enable-qt5)
CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" 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 9e3ad7b..8efb3ee 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Build-Depends: debhelper (>= 9), libltdl-dev, libgsl0-dev, freeglut3-dev,
- libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-dev,
+ libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-dev, libqt5opengl5-dev,
libjpeg-dev, libtiff-dev, libfltk1.3-dev, libqt5webkit5-dev, libwxgtk3.0-dev,
- texinfo, texlive, texlive-generic-recommended, liboctave-dev, liblua5.1-dev,
+ texinfo, texlive, texlive-generic-recommended, liblua5.1-dev, libxcursor-dev,
libgif-dev, python-dev, python-numpy, libfontconfig1-dev, libqtwebkit-dev,
libhdf4-dev, chrpath, libxinerama-dev, libxmu-dev, libxi-dev, libhpdf-dev,
- mpi-default-dev, swig, cmake, libxft-dev
+ mpi-default-dev, swig3.0, cmake, libxft-dev
Standards-Version: 3.9.6
Homepage: http://mathgl.sourceforge.net/doc_en/Main.html
Vcs-Git: git://anonscm.debian.org/debian-science/packages/mathgl.git
diff --git a/debian/patches/CMakeLists.patch b/debian/patches/CMakeLists.patch
index 4802dd7..f6d70e2 100644
--- a/debian/patches/CMakeLists.patch
+++ b/debian/patches/CMakeLists.patch
@@ -60,6 +60,15 @@
if(UNIX AND enable-rvalue)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+@@ -117,7 +117,7 @@
+ endif(enable-qt4 OR enable-qt5)
+
+ CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "enable-qt" 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)
@@ -395,6 +395,8 @@
set(MGL_HAVE_GLUT 0)
endif(enable-glut)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathgl.git
More information about the debian-science-commits
mailing list