[eso-midas] 03/03: Fix more warnings and failures

[Ole Streicher]

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

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

commit 3c0b060e4408fc308b5af58c40acbe4942c29268
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 17 16:58:54 2015 +0100

    Fix more warnings and failures
---
 debian/patches/fix_trivial_errors.patch | 10 ++++++++++
 debian/patches/setup-debian.patch       | 20 ++++++++++++++++++++
 debian/rules                            |  8 +++++++-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/debian/patches/fix_trivial_errors.patch b/debian/patches/fix_trivial_errors.patch
index d824055..87a4a83 100644
--- a/debian/patches/fix_trivial_errors.patch
+++ b/debian/patches/fix_trivial_errors.patch
@@ -63,3 +63,13 @@ Description: Fix/circumvent some trivial errors
  char mymess[60];
  index = strscans(descr,":#");
  if (!descr[index]) {
+--- a/system/machine/computer.c
++++ b/system/machine/computer.c
+@@ -63,6 +63,7 @@
+ 
+ #include <stdio.h>
+ #include <signal.h>
++#include <stdlib.h>
+ 
+ #ifndef NO_FLOAT_H
+ #include <float.h>
diff --git a/debian/patches/setup-debian.patch b/debian/patches/setup-debian.patch
index 539120a..6b69b62 100644
--- a/debian/patches/setup-debian.patch
+++ b/debian/patches/setup-debian.patch
@@ -104,3 +104,23 @@ Description: Debian specific changes
  	rm -f *.o
  
  clean:
+--- a/system/unix/cleanmidas
++++ b/system/unix/cleanmidas
+@@ -54,11 +54,13 @@
+         [ $answer = y ]
+ }
+ 
+-
+ MID_HERE=`pwd`
+-MIDVERS=`echo $MID_HERE | sed 's/^.*midas\/\([^\/]*\).*$/\1/'`
+-MIDASHOME=`echo $MID_HERE | sed 's/\/'$MIDVERS'.*$//'`
+-
++if [ -z "$MIDVERS" ] ; then
++  MIDVERS=`echo $MID_HERE | sed 's/^.*midas\/\([^\/]*\).*$/\1/'`
++fi
++if [ -z "$MIDASHOME" ] ; then
++  MIDASHOME=`echo $MID_HERE | sed 's/\/'$MIDVERS'.*$//'`
++fi
+ MID_HOME=$MIDASHOME/$MIDVERS
+ 
+ export MIDASHOME MIDVERS
diff --git a/debian/rules b/debian/rules
index 3c6017c..1c632c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,13 @@ override_dh_auto_build:
 	$(MID_SYS)/inmidas -m $(MID_WORK) -j "@ ascii_bin no ; bye"
 
 override_dh_install:
-	(cd $(MID_HOME) ; yes | $(MID_SYS)/cleanmidas -a)
+	(cd $(MID_HOME) ; yes | $(MID_SYS)/cleanmidas)
+	find $(MID_HOME) \( \
+		-name "*.a" -o \
+		-name "makefile" -o \
+	        -name "default.mk" -o \
+		-name "*.h" -o \
+		-name "*.inc" \) -exec rm -f {} \;
 	sed -e "s:^MIDVERS0=.*:MIDVERS0=$(MIDVERS):" \
 	    -e "s:^MIDASHOME0=.*:MIDASHOME0=/usr/lib/eso-midas:" \
 	    -i $(MID_HOME)/system/unix/inmidas \

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