[SCM] kalgebra packaging branch, master, updated. debian/4.13.1-1-141-g7e86982

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kalgebra.git;a=commitdiff;h=ffc0a9b

The following commit has been merged in the master branch:
commit ffc0a9bb2017adc717289903a1b771dbaa4483a3
Author: Philip Muskovac <yofel at gmx.net>
Date:   Fri Mar 14 18:55:01 2014 +0100

    Cherry pick fb5fd9a83e0e648736d0f7d8c4a99dce6da4a78b as
    upstream_don-t-require-qtmathml-anymore.diff to make kalgebra
    build again
---
 debian/changelog                                   |  6 +++++
 debian/patches/series                              |  1 +
 .../upstream_don-t-require-qtmathml-anymore.diff   | 30 ++++++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e1ceecb..9a28fea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
 kalgebra (4:4.12.90-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Jonathan Riddell ]
   * New upstream beta release
 
+  [ Philip Muškovac ]
+  * Cherry pick fb5fd9a83e0e648736d0f7d8c4a99dce6da4a78b as
+    upstream_don-t-require-qtmathml-anymore.diff to make kalgebra
+    build again
+
  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 13 Mar 2014 23:42:52 +0000
 
 kalgebra (4:4.12.3-0ubuntu1) trusty; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..03ca70b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_don-t-require-qtmathml-anymore.diff
diff --git a/debian/patches/upstream_don-t-require-qtmathml-anymore.diff b/debian/patches/upstream_don-t-require-qtmathml-anymore.diff
new file mode 100644
index 0000000..b063d57
--- /dev/null
+++ b/debian/patches/upstream_don-t-require-qtmathml-anymore.diff
@@ -0,0 +1,30 @@
+From fb5fd9a83e0e648736d0f7d8c4a99dce6da4a78b Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol at kde.org>
+Date: Fri, 14 Mar 2014 17:33:24 +0100
+Subject: [PATCH] Don't require QtMathML anymore
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c6ee32..ad68e08 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,11 +21,11 @@ add_definitions (-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+ 
+ set(MOBILE_BACKEND "kde" CACHE STRING "Backend to install, currently. Check /mobile/plugins/widgets/*")
+ 
+-if(QTMML_LIBRARY AND NOT MOBILE_BACKEND STREQUAL "harmattan")
++if(NOT MOBILE_BACKEND STREQUAL "harmattan")
+   add_subdirectory(doc)
+   add_subdirectory(src)
+   add_subdirectory(plasmoids)
+-endif(QTMML_LIBRARY AND NOT MOBILE_BACKEND STREQUAL "harmattan")
++endif(NOT MOBILE_BACKEND STREQUAL "harmattan")
+ add_subdirectory(icons)
+ add_subdirectory(utils)
+ 
+-- 
+1.9.0
+

-- 
kalgebra packaging