[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-35-g488241e

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 488241e3d2c90af4011597c652670d3c74e95cbe
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Fri May 18 22:34:55 2012 +0400

    drop useless dependency from ncurses

diff --git a/debian/control b/debian/control
index ff7369c..7792cd8 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Bacula packaging Group <pkg-bacula-devel at lists.alioth.debian.org>
 Uploaders: Jan Hauke Rahm <jhr at debian.org>
 Build-Depends: autotools-dev, autoconf, debhelper (>= 6.0.7~), po-debconf (>= 0.8.2),
- zlib1g-dev, libncurses-dev, libreadline-dev, libjconv-dev,
+ zlib1g-dev, libreadline-dev, libjconv-dev,
  libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 9.1),
  postgresql-server-dev-all,
  libwrap0-dev, python-dev, libgtk2.0-dev (>= 2.10),
diff --git a/debian/patches/fix-readline-ncurses-depends.patch b/debian/patches/fix-readline-ncurses-depends.patch
new file mode 100644
index 0000000..362d4e9
--- /dev/null
+++ b/debian/patches/fix-readline-ncurses-depends.patch
@@ -0,0 +1,44 @@
+Description: Fix ncurses requirement for readline-compiled bconsole
+Bug-Debian: 646730
+Author: Alexander Golovko <alexandro at ankalagon.ru>
+Last-Update: 2012-05-18
+
+--- a/autoconf/configure.in
++++ b/autoconf/configure.in
+@@ -854,9 +854,6 @@ AC_ARG_ENABLE(readline,
+        fi
+    ]
+ )
+-if test x$TERM_LIB = x ; then
+-   support_readline=no
+-fi
+ 
+ got_readline="no"
+ READLINE_SRC=
+@@ -883,7 +880,7 @@ if test x$support_readline = xyes; then
+ 	     AC_CHECK_HEADER(${with_readline}/readline.h, 
+ 		[
+ 		    AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
+-		    CONS_LIBS="-lreadline -lhistory $TERM_LIB"
++		    CONS_LIBS="-lreadline -lhistory"
+ 		    got_readline="yes"	 
+ 		], [
+ 		    echo " "
+@@ -900,7 +897,7 @@ if test x$support_readline = xyes; then
+ 		AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
+ 		got_readline="yes"
+ 		CONS_INC="-I/usr/include/readline"
+-		CONS_LIBS="-lreadline $TERM_LIB"
++		CONS_LIBS="-lreadline"
+ 	    ], [
+ 		dnl Did not find standard library, so try Bacula's default
+ 		AC_CHECK_HEADER(${TOP_DIR}/depkgs/readline/readline.h, 
+@@ -908,7 +905,7 @@ if test x$support_readline = xyes; then
+ 			AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
+ 			got_readline="yes"   
+ 			CONS_INC="-I${TOP_DIR}/depkgs/readline"
+-			CONS_LIBS="-lreadline -lhistory $TERM_LIB"
++			CONS_LIBS="-lreadline -lhistory"
+ 			CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
+ 			PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
+ 		    ], [
diff --git a/debian/patches/series b/debian/patches/series
index 8bef1f4..1173151 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ fix-sql-bindir
 switch-nonfree-sha1-to-openssl.patch
 fix-binutils-gold-linking.patch
 fix-mysql-autoconf.patch
+fix-readline-ncurses-depends.patch

-- 
Bacula, a network backup, recovery and verification program