[eso-midas] 03/06: Use the system provided readline instead of the copy provided with the sources.

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository eso-midas.

commit bd2b1dd493be881b8fbd8984e016c7952ba3a835
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Apr 22 20:15:55 2014 +0200

    Use the system provided readline instead of the copy provided with the sources.
---
 debian/control                       |  3 +-
 debian/patches/series                |  1 +
 debian/patches/setup-debian.patch    |  6 ++--
 debian/patches/system_readline.patch | 54 ++++++++++++++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 5452a75..e719649 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Ole Streicher <debian at liska.ath.cx>
 Build-Depends: debhelper (>= 9),
                gfortran,
                libmotif-dev,
-               libncurses-dev,
+               libncurses5-dev,
+	       libreadline-dev,
                libx11-dev,
                libxt-dev
 Standards-Version: 3.9.5
diff --git a/debian/patches/series b/debian/patches/series
index eea3a6e..5a325fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ ftoc.patch
 fix_formaterrors.patch
 syskeys.patch
 resolve_gmidas_syms.patch
+system_readline.patch
diff --git a/debian/patches/setup-debian.patch b/debian/patches/setup-debian.patch
index 0c8760f..f64a528 100644
--- a/debian/patches/setup-debian.patch
+++ b/debian/patches/setup-debian.patch
@@ -16,7 +16,7 @@ Description: Debian specific changes
  elif [ "$machine" = "x86_64" ]; then
 --- /dev/null
 +++ b/install/unix/systems/Debian/make_options
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,10 @@
 +CC=gcc
 +F_OPT=-O -fPIC
 +C_OPT=-O -fPIC
@@ -25,6 +25,8 @@ Description: Debian specific changes
 +SH_OPT=-fPIC
 +SH_CMD=$(MIDASHOME)/$(MIDVERS)/local/make_shared
 +GUI_OPT=-DPATH_MAX=1024 -Ddg88
++EDITFLAGS=-DVOID_SIGHANDLER -DHAVE_ALLOCA -DHAVE_ALLOCA_H -DUSG -DUSGr3 -DHAVE_GETPW_DECLS -DHAVE_DIRENT_H -DHAVE_STRING_H -DLinux -DHAVE_UNISTD_H -DHAVE_STDLIB_H
++EDITLIBS=-lreadline -lncurses
 --- /dev/null
 +++ b/install/unix/systems/Debian/make_shared
 @@ -0,0 +1,6 @@
@@ -60,7 +62,7 @@ Description: Debian specific changes
  ed_moptions add "E_OPT= $EO"  >/dev/null
  
  
-@@ -614,7 +614,7 @@
+@@ -614,7 +615,7 @@
    x11incl="found"
  else
    ed_moptions delete X11INC >/dev/null
diff --git a/debian/patches/system_readline.patch b/debian/patches/system_readline.patch
new file mode 100644
index 0000000..e5ee094
--- /dev/null
+++ b/debian/patches/system_readline.patch
@@ -0,0 +1,54 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Use the system provided readline instead of the copy 
+ provided with the sources.
+--- a/install/unix/install1
++++ b/install/unix/install1
+@@ -576,7 +576,7 @@
+ then
+   echo "OK."
+   ed_moptions replace "EDITSWITCH=-DEdit_dummy" >/dev/null
+-  ed_moptions replace "EDITLIBS=-lzreadline -lncurses" >/dev/null
++  ed_moptions replace "EDITLIBS=-lreadline -lncurses" >/dev/null
+ else
+   echo "Not found."
+   echo "*** WARNING: You'll not be able to edit Midas commands in the monitor."
+@@ -596,7 +596,7 @@
+ 
+   if [ $answ = "c" -o  $answ = "C" ]; then
+     ed_moptions replace "EDITSWITCH=-DNO_READLINE" >/dev/null
+-    ed_moptions replace "EDITLIBS=-lzreadline" >/dev/null
++    ed_moptions replace "EDITLIBS=-lreadline" >/dev/null
+   else
+     exit 1
+   fi
+--- a/libsrc/readline/makefile
++++ b/libsrc/readline/makefile
+@@ -25,7 +25,7 @@
+ 	history.o tilde.o xmalloc.o
+ 
+ # DEPENDENCIES:
+-all: $(LIB)
++all:
+ 
+ $(LIB): $(OBJ)
+ 	$(AR) $(AR_OPT) $(LIB) $(OBJ)
+--- a/install/unix/install1.sh
++++ b/install/unix/install1.sh
+@@ -575,7 +575,7 @@
+ then
+   echo "OK."
+   ed_moptions replace "EDITSWITCH=-DEdit_dummy" >/dev/null
+-  ed_moptions replace "EDITLIBS=-lzreadline -lncurses" >/dev/null
++  ed_moptions replace "EDITLIBS=-lreadline -lncurses" >/dev/null
+ else
+   echo "Not found."
+   echo "*** WARNING: You'll not be able to edit Midas commands in the monitor."
+@@ -595,7 +595,7 @@
+ 
+   if [ $answ = "c" -o  $answ = "C" ]; then
+     ed_moptions replace "EDITSWITCH=-DNO_READLINE" >/dev/null
+-    ed_moptions replace "EDITLIBS=-lzreadline" >/dev/null
++    ed_moptions replace "EDITLIBS=-lreadline" >/dev/null
+   else
+     exit 1
+   fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git