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

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit a2ea6403a4360a9767edeae56fa6939938b7cf77
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Sat Oct 22 00:06:08 2011 +0200

    Amend add_find_analitza_cmake.diff
---
 debian/patches/add_find_analitza_cmake.diff |   35 ++++-----------------------
 1 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/debian/patches/add_find_analitza_cmake.diff b/debian/patches/add_find_analitza_cmake.diff
index 52808e8..7236325 100644
--- a/debian/patches/add_find_analitza_cmake.diff
+++ b/debian/patches/add_find_analitza_cmake.diff
@@ -1,33 +1,8 @@
---- /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)
+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 @@

-- 
cantor packaging