[SCM] cantor packaging branch, master, updated. 5170f0bde366ef0083d0d0bc076ed58fa52971a2

Fri Oct 21 22:32:18 UTC 2011

The following commit has been merged in the master branch:
commit 4d8b80ce9029a7b4b315b3f085aa9a18c76c34b5
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Oct 19 03:24:48 2011 +0200

    Make cantor-backend-kalgebra build.
---
 debian/control                              |   32 ++++++------
 debian/patches/add_find_analitza_cmake.diff |   73 +++++++++++++++++++++++++++
 debian/patches/series                       |    1 +
 3 files changed, 90 insertions(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index 1dd2c3b..8622ab5 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.7.2),
  pkg-config,
  libspectre-dev,
  libx11-dev,
- kalgebra
+ kalgebra-dev
 # r-base-core
 Standards-Version: 3.9.2
 Homepage: http://edu.kde.org/
@@ -21,7 +21,7 @@ Vcs-Git: git://git.debian.org/pkg-kde/kde-sc/cantor.git
 Package: cantor
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-#Recommends: cantor-backend-kalgebra
+Recommends: cantor-backend-kalgebra
 Suggests: cantor-backend-maxima, cantor-backend-sage,
  cantor-backend-octave
 # cantor-backend-r
@@ -33,7 +33,7 @@ Description: interface for mathematical applications
  .
  Cantor supports various mathematical applications as backends (provided in
  external packages):
-#  * KAlgebra (cantor-backend-kalgebra)
+  * KAlgebra (cantor-backend-kalgebra)
   * Maxima Computer Algebra System (cantor-backend-maxima)
 #  * R Project for Statistical Computing (cantor-backend-r)
   * Sage Mathematics Software (cantor-backend-sage)
@@ -41,19 +41,19 @@ Description: interface for mathematical applications
  .
  This package is part of the KDE education module.
 
-#Package: cantor-backend-kalgebra
-#Architecture: any
-#Depends: ${shlibs:Depends}, ${misc:Depends}, kalgebra
-#Description: KAlgebra backend for Cantor
-# Cantor is an application to allow you to you use your favorite mathematical
-# applications from within an elegant KDE-integrated worksheet interface. It
-# provides dialogs to assist with common tasks and allows you to share your
-# worksheets with others.
-# .
-# This package provides the backend for using KAlgebra
-# (http://edu.kde.org/kalgebra) in Cantor.
-# .
-# This package is part of the KDE education module.
+Package: cantor-backend-kalgebra
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, kalgebra
+Description: KAlgebra backend for Cantor
+ Cantor is an application to allow you to you use your favorite mathematical
+ applications from within an elegant KDE-integrated worksheet interface. It
+ provides dialogs to assist with common tasks and allows you to share your
+ worksheets with others.
+ .
+ This package provides the backend for using KAlgebra
+ (http://edu.kde.org/kalgebra) in Cantor.
+ .
+ This package is part of the KDE education module.
 
 Package: cantor-backend-maxima
 Architecture: any
diff --git a/debian/patches/add_find_analitza_cmake.diff b/debian/patches/add_find_analitza_cmake.diff
new file mode 100644
index 0000000..52808e8
--- /dev/null
+++ b/debian/patches/add_find_analitza_cmake.diff
@@ -0,0 +1,73 @@
+--- /dev/null
++++ b/cmake/FindAnalitza.cmake
+@@ -0,0 +1,27 @@
++# Find libanalitza
++# Once done this will define
++#
++#  ANALITZA_FOUND    - system has Analitza Library
++#  ANALITZA_INCLUDES - the Analitza include directory
++#  ANALITZA_LIBS     - link these to use Analitza
++#  ANALITZA_VERSION  - the version of the Analitza Library
++
++# Copyright (c) 2011, Aleix Pol Gonzalez <aleixpol at kde.org>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++find_library(ANALITZA_LIBRARY NAMES analitza HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
++find_library(ANALITZAGUI_LIBRARY NAMES analitzagui HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
++
++find_path(ANALITZA_INCLUDE_DIR NAMES analitza/analitzaexport.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
++
++if(ANALITZA_INCLUDE_DIR AND ANALITZA_LIBRARY)
++   set(ANALITZA_LIBS ${analitza_LIB_DEPENDS} ${ANALITZA_LIBRARY} ${ANALITZAGUI_LIBRARY})
++   set(ANALITZA_INCLUDES ${ANALITZA_INCLUDE_DIR}/KDE ${ANALITZA_INCLUDE_DIR})
++endif(ANALITZA_INCLUDE_DIR AND ANALITZA_LIBRARY)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(Analitza  DEFAULT_MSG  ANALITZA_INCLUDE_DIR ANALITZA_LIBRARY)
++
++mark_as_advanced(ANALITZA_INCLUDE_DIR ANALITZA_LIBRARY)
+--- a/src/backends/kalgebra/CMakeLists.txt
++++ b/src/backends/kalgebra/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-include_directories(${analitza_SOURCE_DIR}/../)
++include_directories(${ANALITZA_INCLUDES})
+ 
+ set( KAlgebraBackend_SRCS
+  kalgebrasyntaxhelpobject.cpp 
+@@ -10,7 +10,7 @@ set( KAlgebraBackend_SRCS
+ )
+ 
+ kde4_add_plugin( cantor_kalgebrabackend ${KAlgebraBackend_SRCS} )
+-target_link_libraries( cantor_kalgebrabackend ${KDE4_KDEUI_LIBS} cantorlibs analitza analitzagui)
++target_link_libraries( cantor_kalgebrabackend ${KDE4_KDEUI_LIBS} cantorlibs ${ANALITZA_LIBS})
+ 
+ install( FILES kalgebrabackend.desktop  DESTINATION ${SERVICES_INSTALL_DIR}/cantor)
+ install(TARGETS cantor_kalgebrabackend DESTINATION ${PLUGIN_INSTALL_DIR})
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,6 +5,9 @@ include(KDE4Defaults)
+ 
+ set(CMAKE_MODULE_PATH ${cantor_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+ 
++macro_optional_find_package(Analitza)
++macro_log_feature(ANALITZA_FOUND "libanalitza" "A library provided by KAlgebra" FALSE "" "Backend to use KAlgebra with Cantor.")
++
+ macro_optional_find_package(R)
+ macro_log_feature(R_FOUND "R" "A free software environment for statistical computing and graphics" "http://www.r-project.org/" FALSE "" "Backend to use R with Cantor.")
+ 
+--- a/src/backends/CMakeLists.txt
++++ b/src/backends/CMakeLists.txt
+@@ -2,9 +2,9 @@ add_subdirectory(null)
+ add_subdirectory(maxima)
+ add_subdirectory(octave)
+ 
+-if(BUILD_kalgebra)
++if(ANALITZA_FOUND)
+ 	add_subdirectory(kalgebra)
+-endif(BUILD_kalgebra)
++endif(ANALITZA_FOUND)
+ 
+ if(NOT WIN32)
+ 	add_subdirectory(sage)
diff --git a/debian/patches/series b/debian/patches/series
index 0fe063c..a7d3305 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 no_install_rpath_use_link_path.diff
+add_find_analitza_cmake.diff

-- 
cantor packaging

