[SCM] cantor packaging branch, master, updated. debian/4.7.2-1-3-g16b1498

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 9beff86ec55ce8e57a71b80efcc2a16f96f38d00
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Dec 8 02:20:42 2011 +0100

    Remove add_find_analitza_cmake.diff.
---
 debian/changelog                            |    1 +
 debian/patches/add_find_analitza_cmake.diff |   48 ---------------------------
 debian/patches/series                       |    1 -
 3 files changed, 1 insertions(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index acf2328..cb8a687 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ cantor (4:4.7.4-0r0) UNRELEASED; urgency=low
   
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.7.4.
+  * Remove add_find_analitza_cmake.diff, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 08 Dec 2011 01:55:34 +0100
 
diff --git a/debian/patches/add_find_analitza_cmake.diff b/debian/patches/add_find_analitza_cmake.diff
deleted file mode 100644
index 7236325..0000000
--- a/debian/patches/add_find_analitza_cmake.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Author: José Manuel Santamaría Lema <panfaust at gmail.com>
-Origin: https://projects.kde.org/projects/kde/kdeedu/cantor/repository/revisions/2ffe4fc9
-Applied-Upstream: 4.7.3
-Description: Fix detection of KAlgebra
- This patch allows Cantor to build the Kalgebra backend.
---- 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 a7d3305..0fe063c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 no_install_rpath_use_link_path.diff
-add_find_analitza_cmake.diff

-- 
cantor packaging