[SCM] kalgebra packaging branch, master, updated. 2cfd07bb1d913b1e89183e53f961af0f15efed72

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 61d872d2b5db53b3f28ddc5aa3dc45d5f112896a
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Oct 21 23:13:08 2011 +0200

    Add a couple of upstream patches needed to build cantor-backend-kalgebra
---
 debian/kalgebra-dev.install                 |    3 +-
 debian/patches/add_findanalitza.diff        |   48 +++++++++++++++++++++++++++
 debian/patches/install_variables_model.diff |   19 ++++++++++
 debian/patches/series                       |    2 +
 4 files changed, 71 insertions(+), 1 deletions(-)

diff --git a/debian/kalgebra-dev.install b/debian/kalgebra-dev.install
index b608bbd..e714209 100644
--- a/debian/kalgebra-dev.install
+++ b/debian/kalgebra-dev.install
@@ -1,4 +1,3 @@
-analitzagui/variablesmodel.h usr/include/analitzagui/
 usr/include/analitza/abstractlexer.h
 usr/include/analitza/analitzaexport.h
 usr/include/analitza/analitzautils.h
@@ -14,5 +13,7 @@ usr/include/analitza/variables.h
 usr/include/analitzagui/algebrahighlighter.h
 usr/include/analitzagui/analitzaguiexport.h
 usr/include/analitzagui/operatorsmodel.h
+usr/include/analitzagui/variablesmodel.h
 usr/lib/libanalitza.so
 usr/lib/libanalitzagui.so
+usr/share/kde4/apps/cmake/modules/FindAnalitza.cmake
diff --git a/debian/patches/add_findanalitza.diff b/debian/patches/add_findanalitza.diff
new file mode 100644
index 0000000..7812b6e
--- /dev/null
+++ b/debian/patches/add_findanalitza.diff
@@ -0,0 +1,48 @@
+Author: Aleix Pol <aleixpol at kde.org>
+Author: José Manuel Santamaría Lema <panfaust at gmail.com>
+Origin: https://projects.kde.org/projects/kde/kdeedu/kalgebra/repository/revisions/45f52755
+Origin: https://projects.kde.org/projects/kde/kdeedu/kalgebra/repository/revisions/22be6e20
+Applied-Upstream: 4.7.3
+Description: Provide a cmake file to allow cantor to link against libanalitza[gui]
+ Without this patch wouldn't be possible to build cantor-backend-kalgebra, built
+ in the cantor source package.
+--- a/analitza/CMakeLists.txt
++++ b/analitza/CMakeLists.txt
+@@ -62,6 +62,6 @@ if(INSTALL_ANALITZA_HEADERS)
+ 		DESTINATION ${INCLUDE_INSTALL_DIR}/analitza/ COMPONENT Devel)
+ 	
+ 	install(FILES
+-	#		../FindAnalitza.cmake
++			../cmake/FindAnalitza.cmake
+ 			DESTINATION ${DATA_INSTALL_DIR}/cmake/modules)
+ endif(INSTALL_ANALITZA_HEADERS)
+--- /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)
diff --git a/debian/patches/install_variables_model.diff b/debian/patches/install_variables_model.diff
new file mode 100644
index 0000000..3338479
--- /dev/null
+++ b/debian/patches/install_variables_model.diff
@@ -0,0 +1,19 @@
+Author: Aleix Pol <aleixpol at kde.org>
+Origin: https://projects.kde.org/projects/kde/kdeedu/kalgebra/repository/revisions/840838ef
+Applied-Upstream: 4.7.3
+Description: Install analitzagui/variablesmodel.h
+ Without this patch wouldn't be possible to build cantor-backend-kalgebra, built
+ in the cantor source package.
+--- a/analitzagui/CMakeLists.txt
++++ b/analitzagui/CMakeLists.txt
+@@ -41,6 +41,7 @@ if(INSTALL_ANALITZA_HEADERS)
+ 		algebrahighlighter.h
+ 		analitzaguiexport.h
+ 		operatorsmodel.h
++		variablesmodel.h
+ 
+                 DESTINATION ${INCLUDE_INSTALL_DIR}/analitzagui/ COMPONENT Devel)
+ endif(INSTALL_ANALITZA_HEADERS)
+-- 
+1.7.7
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2363fe0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+add_findanalitza.diff
+install_variables_model.diff

-- 
kalgebra packaging