[eso-midas] 02/03: Create new nonlinux.patch and fill it from debian_setup.patch

[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 1a9c5d2ba5cadf3df8cfc5b6bd3aa787118a134a
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Mar 23 09:48:09 2015 +0100

    Create new nonlinux.patch and fill it from debian_setup.patch
---
 debian/patches/debian_setup.patch | 21 ---------------------
 debian/patches/nonlinux.patch     | 23 +++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/debian/patches/debian_setup.patch b/debian/patches/debian_setup.patch
index 99ca45a..a739dba 100644
--- a/debian/patches/debian_setup.patch
+++ b/debian/patches/debian_setup.patch
@@ -43,24 +43,3 @@ Description: Debian specific setup
 +debugger=gdb
 +ps_print="lpr -h"
 +ascii_print="lpr -h -P"
---- a/system/unix/inmidas
-+++ b/system/unix/inmidas
-@@ -425,7 +425,7 @@
- #
- os=`uname`
- case "$os" in
--    "SunOS"|"Linux")
-+    SunOS|Linux|GNU|GNU/*)
- 	if [ -z "$LD_LIBRARY_PATH" ] ; then
- 	  LD_LIBRARY_PATH=$MIDASHOME/$MIDVERS/lib
- 	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} ..."
diff --git a/debian/patches/nonlinux.patch b/debian/patches/nonlinux.patch
new file mode 100644
index 0000000..e5f68f1
--- /dev/null
+++ b/debian/patches/nonlinux.patch
@@ -0,0 +1,23 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Fixes for non-linux (kFreeBSD, Hurd)
+--- a/system/unix/inmidas
++++ b/system/unix/inmidas
+@@ -425,7 +425,7 @@
+ #
+ os=`uname`
+ case "$os" in
+-    "SunOS"|"Linux")
++    SunOS|Linux|GNU|GNU/*)
+ 	if [ -z "$LD_LIBRARY_PATH" ] ; then
+ 	  LD_LIBRARY_PATH=$MIDASHOME/$MIDVERS/lib
+ 	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} ..."
diff --git a/debian/patches/series b/debian/patches/series
index 01b7de0..2bca1fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 propagate_cflags.patch
 output_to_stdout.patch
 debian_setup.patch
+nonlinux.patch
 fix_cleanmidas.patch
 dont_strip_during_build.patch
 fix_library_search_path.patch

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