[eso-midas] 01/01: Use constant verification logfile to avoid problems if uname contains '/'

[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 878d93ac5b89d51a54c97da4bb2556ead944a625
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Mar 18 21:35:16 2015 +0100

    Use constant verification logfile to avoid problems if uname contains '/'
---
 debian/patches/setup-debian.patch | 59 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 4 deletions(-)

diff --git a/debian/patches/setup-debian.patch b/debian/patches/setup-debian.patch
index 3d03e02..c9c72c6 100644
--- a/debian/patches/setup-debian.patch
+++ b/debian/patches/setup-debian.patch
@@ -18,15 +18,15 @@ Description: Debian specific changes
 +++ b/install/unix/systems/Debian/make_options
 @@ -0,0 +1,10 @@
 +CC=gcc
-+F_OPT=-O -fPIC
-+C_OPT=-O -fPIC
-+SYS=-DLinuxAMD64 -DGCC
++F_OPT=
++C_OPT=
++SYS=-DGCC
 +SLIB=-Wl,-rpath,/usr/lib/eso-midas/$(MIDVERS)/lib
 +SH_OPT=-fPIC
 +SH_CMD=$(MIDASHOME)/$(MIDVERS)/local/make_shared
 +GUI_OPT=-DPATH_MAX=1024
 +EDITFLAGS=-DVOID_SIGHANDLER -DHAVE_ALLOCA -DHAVE_ALLOCA_H -DHAVE_GETPW_DECLS -DHAVE_DIRENT_H -DHAVE_STRING_H -DLinux -DHAVE_UNISTD_H -DHAVE_STDLIB_H
-+EDITLIBS=-lreadline -lncurses
++EDITLIBS=-lncurses
 --- /dev/null
 +++ b/install/unix/systems/Debian/make_shared
 @@ -0,0 +1,6 @@
@@ -135,3 +135,54 @@ Description: Debian specific changes
  	if [ -z "$LD_LIBRARY_PATH" ] ; then
  	  LD_LIBRARY_PATH=$MIDASHOME/$MIDVERS/lib
  	else
+--- a/prim/dio/libsrc/fitswdm.c
++++ b/prim/dio/libsrc/fitswdm.c
+@@ -237,12 +237,7 @@
+          {                      /* NULL fill if needed  */
+          pi = p.i + ns;
+          i = n - ns;
+-
+-#ifdef LinuxAMD64
+          while (i--) toNULLINT (*pi++);
+-#else
+-         while (i--) toNULLLONG (*pi++);
+-#endif
+          }
+       ioff += n;
+       np = 4 * ns;
+@@ -279,12 +274,7 @@
+          while (n--)
+          if (isNULLFLOAT (*pf))
+             {
+-
+-#ifdef LinuxAMD64
+             toNULLINT (*pi++);
+-#else
+-            toNULLLONG (*pi++);
+-#endif
+             *pf++;
+             }
+          else
+@@ -332,12 +322,7 @@
+          while (n--)
+          if (isNULLFLOAT (*pd))
+             {
+-
+-#ifdef LinuxAMD64
+             toNULLINT (*pi++);
+-#else
+-            toNULLLONG (*pi++);
+-#endif
+             *pd++;
+             }
+          else
+--- a/test/prim/veriall.prg
++++ b/test/prim/veriall.prg
+@@ -204,6 +204,7 @@
+       write/keyw in_b MID_WORK:veriall_{out_b(1:{inputi})}.{inputc}
+    endif
+ endif
++write/keyw in_b  MID_WORK:veriall_debian.{inputc}
+ open/file {in_b} write  fc
+ if fc(1) .lt. 0 then
+    write/out Could not create file: "MID_WORK:veriall_{out_b}.{inputc} ..."

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