[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=6e0a876

The following commit has been merged in the master branch:
commit 6e0a8761a8278463b7d54221b9b4d6a1e30d3440
Author: Colin Watson <cjwatson at canonical.com>
Date:   Thu Nov 10 15:42:31 2011 +0000

    Remove libncurses requirement.  calgebra only uses symbols from
    libreadline.
---
 debian/changelog                               |  5 +++
 debian/control                                 |  1 -
 debian/patches/remove_ncurses_requirement.diff | 43 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7902392..8eb678f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 kalgebra (4:4.7.3-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Philip Muškovac ]
   * New upstream release
     - Move libanalitza and libanalitzagui into seperate packages
     - Add symbol files for libanaliza and libanalitzagui
@@ -11,6 +12,10 @@ kalgebra (4:4.7.3-0ubuntu1) UNRELEASED; urgency=low
     - Add kalgebra-dev with analitza headers, needed by cantor
     - add libncurses-dev to build-deps
 
+  [ Colin Watson ]
+  * Remove libncurses requirement.  calgebra only uses symbols from
+    libreadline.
+
  -- Philip Muškovac <yofel at kubuntu.org>  Sat, 29 Oct 2011 11:42:28 +0200
 
 kalgebra (4:4.7.2-0ubuntu1) oneiric-proposed; urgency=low
diff --git a/debian/control b/debian/control
index 7baa9a5..a519481 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.7.3),
  pkg-kde-tools (>= 0.12),
  kdelibs5-dev (>= 4:4.6),
  libreadline-dev,
- libncurses-dev,
  pkg-config,
  libqt4-opengl-dev,
  libkdeedu-dev
diff --git a/debian/patches/remove_ncurses_requirement.diff b/debian/patches/remove_ncurses_requirement.diff
new file mode 100644
index 0000000..7433ce0
--- /dev/null
+++ b/debian/patches/remove_ncurses_requirement.diff
@@ -0,0 +1,43 @@
+Description: Do not unnecessarily link against ncurses
+Author: Colin Watson <cjwatson at ubuntu.com>
+Bug: https://bugs.kde.org/show_bug.cgi?id=286272
+Forwarded: yes
+Last-Update: 2011-11-10
+
+Index: b/calgebra/CMakeLists.txt
+===================================================================
+--- a/calgebra/CMakeLists.txt
++++ b/calgebra/CMakeLists.txt
+@@ -5,7 +5,7 @@
+ )
+ 
+ kde4_add_executable(calgebra ${calgebra_SRCS})
+-target_link_libraries(calgebra ${QT_QTCORE_LIBRARY} ${READLINE_LIBRARY} ${NCURSES_LIBRARY} analitza)
++target_link_libraries(calgebra ${QT_QTCORE_LIBRARY} ${READLINE_LIBRARY} analitza)
+ 
+ install(TARGETS calgebra ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+Index: b/cmake/FindReadline.cmake
+===================================================================
+--- a/cmake/FindReadline.cmake
++++ b/cmake/FindReadline.cmake
+@@ -1,15 +1,14 @@
+ # GNU Readline library finder
+-if(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
++if(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
+ 	set(READLINE_FOUND TRUE)
+-else(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
++else(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
+ 	FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h
+ 		/usr/include/readline
+ 	)
+ 	
+ 	FIND_LIBRARY(READLINE_LIBRARY NAMES readline)
+-        FIND_LIBRARY(NCURSES_LIBRARY NAMES ncurses )
+         include(FindPackageHandleStandardArgs)
+-        FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG NCURSES_LIBRARY READLINE_INCLUDE_DIR READLINE_LIBRARY )
++        FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG READLINE_INCLUDE_DIR READLINE_LIBRARY )
+ 	
+ 	MARK_AS_ADVANCED(READLINE_INCLUDE_DIR READLINE_LIBRARY)
+-endif(READLINE_INCLUDE_DIR AND READLINE_LIBRARY AND NCURSES_LIBRARY)
++endif(READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
diff --git a/debian/patches/series b/debian/patches/series
index ba161c0..d220ab6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 enable_debianabimanager.diff
+remove_ncurses_requirement.diff

-- 
kalgebra packaging