[SCM] Calligra suite packaging branch, tip, updated. debian/2.4.3-2-368-g6843e2f

[Adrien Grellier]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=8a0b021

The following commit has been merged in the tip branch:
commit 8a0b0217265a8071fa4a53aa05ff251c4b40d12a
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Fri Nov 9 21:56:19 2012 +0100

    Removed do_not_link_blas.diff. Included upstream.
---
 debian/changelog                     |    1 +
 debian/patches/do_not_link_blas.diff |   18 ------------------
 debian/patches/series                |    1 -
 3 files changed, 1 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd8261a..bc52dfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ calligra (1:2.5.91-1) UNRELEASED; urgency=low
   [ Raúl Sánchez Siles ]
   * New upstream release
     - Added build_videoshape_thumbnails_phononexperimental.diff to fix FTBFS
+    - Removed do_not_link_blas.diff. Included upstream.
 
  -- Adrien Grellier <adrien.grellier at laposte.net>  Tue, 21 Aug 2012 10:17:19 +0200
 
diff --git a/debian/patches/do_not_link_blas.diff b/debian/patches/do_not_link_blas.diff
deleted file mode 100644
index 23a7f2a..0000000
--- a/debian/patches/do_not_link_blas.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Do not link blas library
- Upstream is linking blas library which is not needed.
-Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
-Last-Update: 2011-12-01
-Origin: vendor
-Forwarded: no
-Last-Update: 2012-03-27
-
---- a/sheets/plugins/solver/CMakeLists.txt
-+++ b/sheets/plugins/solver/CMakeLists.txt
-@@ -27,7 +27,6 @@
- 
- target_link_libraries( kspreadsolver
- 	${GSL_LIBRARIES}
--	${GSL_CBLAS_LIBRARIES}
-         calligrasheetscommon
- )
- 
diff --git a/debian/patches/series b/debian/patches/series
index 78ff283..e73d526 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 build_videoshape_thumbnails_phononexperimental.diff
-do_not_link_blas.diff

-- 
Calligra suite packaging