[SCM] Packaging for mathgl branch, experimental, updated. debian/2.1.2+svn722-1-3-g679e0bf

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the experimental branch:
commit 249fc207b6c426e71a01b254846e1a23e52b616d
Merge: ffd8465017b77e10add1e106fb4e4b9473fa6db9 c59c5061299462e395132baebc6f8e96a0c82d12
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Fri May 3 11:32:04 2013 +0300

    Merge tag 'upstream/2.1.3' into experimental
    
    Upstream version 2.1.3

diff --combined CMakeLists.txt
index 2547e42,3364973..d76d155
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -9,7 -9,7 +9,7 @@@ endif(NOT CMAKE_BUILD_TYPE
  
  set(CMAKE_VERBOSE_MAKEFILE ON)
  set(MathGL_VERSION_MAJOR 2)
- set(MathGL_VERSION_MINOR 1.2)
+ set(MathGL_VERSION_MINOR 1.3)
  
  
  MACRO(MGL_DEPENDENT_OPTION option doc default depends1 force1 depends2 force2)
@@@ -59,8 -59,8 +59,8 @@@ set(MGL_LIB_INSTALL_DIR "lib" CACHE STR
  
  option(enable-double "Enable double precision in MathGL library" ON)
  option(enable-simple "Slightly increase drawing speed but disable mglDataA class")
 -option(enable-mpi "Enable mpi")
 -option(enable-doc "Enable documentation building")
 +option(enable-mpi "Enable mpi" ON)
 +option(enable-doc "Enable documentation building" ON)
  option(enable-all "Enable all core features")
  option(enable-all-widgets "Enable all Widgets")
  option(enable-all-swig "Enable all SWIG based interfaces")
@@@ -70,23 -70,36 +70,36 @@@ option(enable-mgl2 "Use names 'libmgl2-
  #option(enable-ltdl "Enable loading modules support")
  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)
 -CMAKE_DEPENDENT_OPTION(enable-opengl "Enable OpenGL support" ON "NOT enable-mpi" OFF)
 -MGL_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-lgpl;NOT enable-mpi" ON "NOT enable-all-widgets" ON)
 -MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-lgpl;NOT enable-mpi" ON "NOT enable-all-widgets" ON)
 -CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-lgpl;NOT enable-mpi" OFF)
 -MGL_DEPENDENT_OPTION(enable-qt "Enable Qt4 widget" OFF "NOT enable-lgpl;NOT enable-mpi" ON "NOT enable-all-widgets" ON)
 -MGL_DEPENDENT_OPTION(enable-python "Enable python 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)
 +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)
 +CMAKE_DEPENDENT_OPTION(enable-opengl "Enable OpenGL support" ON "NOT enable-mpi" 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" ON)
 +MGL_DEPENDENT_OPTION(enable-qt "Enable Qt4 widget" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON)
 +MGL_DEPENDENT_OPTION(enable-python "Enable python interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
 +MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" ON "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)
  
  include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include)
  set(MGL_INCLUDE_PATH "${CMAKE_INSTALL_PREFIX}/include/mgl2")
+ set(MGL_CGI_PATH "${CMAKE_INSTALL_PREFIX}/share/mathgl" CACHE STRING "Set CGI install directory")
+ 
+ if(NOT WIN32)
+ #	set(MGL_CGI_PATH "${CMAKE_INSTALL_PREFIX}/share/mathgl")
+ 	set(MGL_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/mathgl")
+ 	set(MGL_DOC_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/mathgl")
+ 	set(MGL_MAN_PATH "${CMAKE_INSTALL_PREFIX}/share/man")
+ 	set(MGL_INFO_PATH "${CMAKE_INSTALL_PREFIX}/share/info")
+ 	set(MGL_FONT_PATH "${MGL_DATA_PATH}/fonts")
+ 	install(DIRECTORY fonts/ DESTINATION ${MGL_FONT_PATH}
+ 			PATTERN ".svn" EXCLUDE
+ 			PATTERN "*.vfm")
+ endif(NOT WIN32)
  
  include(CheckFunctionExists)
  include(CMakePushCheckState)
@@@ -395,17 -408,6 +408,6 @@@ if(WIN32
  	add_definitions(-DWIN32)
  endif(WIN32)
  
- if(NOT WIN32)
- set(MGL_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/mathgl")
- set(MGL_DOC_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/mathgl")
- set(MGL_MAN_PATH "${CMAKE_INSTALL_PREFIX}/share/man")
- set(MGL_INFO_PATH "${CMAKE_INSTALL_PREFIX}/share/info")
- set(MGL_FONT_PATH "${MGL_DATA_PATH}/fonts")
- install(DIRECTORY fonts/ DESTINATION ${MGL_FONT_PATH}
- 		PATTERN ".svn" EXCLUDE
- 		PATTERN "*.vfm")
- endif(NOT WIN32)
- 
  add_subdirectory( src )
  add_subdirectory( widgets )
  add_subdirectory( include )

-- 
Packaging for mathgl