[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=d18ff51

The following commit has been merged in the master branch:
commit d18ff51f37a5ad21933ac5aadb2bf4cee3cd4f27
Author: Philip Muskovac <yofel at gmx.net>
Date:   Fri Mar 21 02:27:14 2014 +0100

    * Drop upstream_don-t-require-qtmathml-anymore.diff, applied upstream
---
 debian/changelog                                   |  4 +++
 debian/patches/series                              |  1 -
 .../upstream_don-t-require-qtmathml-anymore.diff   | 30 ----------------------
 3 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 971c9ee..52b62e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 kalgebra (4:4.12.95-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Rohan Garg ]
   * New upstream beta release
 
+  [ Philip Muškovac ]
+  * Drop upstream_don-t-require-qtmathml-anymore.diff, applied upstream
+
  -- Rohan Garg <rohangarg at kubuntu.org>  Thu, 20 Mar 2014 19:57:09 +0100
 
 kalgebra (4:4.12.90-0ubuntu1) trusty; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 03ca70b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index b063d57..0000000
--- a/debian/patches/upstream_don-t-require-qtmathml-anymore.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-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