[eso-midas] 02/02: Fix wrong ftoc estimation

[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 d2aaa32d080807815135cc2fc7235b812ca06924
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Apr 23 14:27:49 2014 +0200

    Fix wrong ftoc estimation
---
 debian/patches/ftoc.patch         | 47 ---------------------------------------
 debian/patches/series             |  1 -
 debian/patches/setup-debian.patch |  2 +-
 3 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/debian/patches/ftoc.patch b/debian/patches/ftoc.patch
deleted file mode 100644
index 5cab740..0000000
--- a/debian/patches/ftoc.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix new ftoc compilation.
- Always use ftoc_amd64.h instead of calling ftoc_comm.
---- a/system/ftoc-new/makefile
-+++ b/system/ftoc-new/makefile
-@@ -57,9 +57,8 @@
- $(INC)/ftoc.h: $(M)/ftoc_noop
- 	cp $(INC)/ftoc_pc3.h $(INC)/ftoc.h
- 
--$(INC)/ftoc_comm.h: $(M)/ftoc_comm.exe
--	rm -f $@
--	cp $(INC)/`$(M)/ftoc_comm.exe` $@
-+$(INC)/ftoc_comm.h:
-+	cp $(INC)/ftoc_amd64.h $@
- 
- $(INC)/ftoc_log.h: $(M)/ftoc_log.exe
- 	rm -f $(INC)/ftoc_log.h
---- a/libsrc/ftoc-new/stf.fc
-+++ b/libsrc/ftoc-new/stf.fc
-@@ -44,6 +44,7 @@
- -----------------------------------------------------------------------------*/
- 
- #include <ftoc_comm.h>
-+#include <ftoc_commc.h>
- #include <midas_def.h>
- 
- #include <stdlib.h>
---- a/libsrc/ftoc-new/sti.fc
-+++ b/libsrc/ftoc-new/sti.fc
-@@ -46,6 +46,7 @@
- -----------------------------------------------------------------------------*/
- 
- #include <ftoc_comm.h>
-+#include <ftoc_commc.h>
- #include <midas_def.h>
- 	
- 
---- a/libsrc/ftoc-new/tbc.fc
-+++ b/libsrc/ftoc-new/tbc.fc
-@@ -44,6 +44,7 @@
- -----------------------------------------------------------------------------*/
- 
- #include <ftoc_comm.h>
-+#include <ftoc_commc.h>
- 
- #include <tbldef.h>
- #include <midas_def.h>
diff --git a/debian/patches/series b/debian/patches/series
index 72b4916..93eae7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ setup-debian.patch
 writting.patch
 fix_shellscripts.patch
 propagate_buildflags.patch
-ftoc.patch
 fix_formaterrors.patch
 syskeys.patch
 resolve_gmidas_syms.patch
diff --git a/debian/patches/setup-debian.patch b/debian/patches/setup-debian.patch
index f64a528..8a9f285 100644
--- a/debian/patches/setup-debian.patch
+++ b/debian/patches/setup-debian.patch
@@ -52,7 +52,7 @@ Description: Debian specific changes
 -   MACH="-m64"
 -   EO="-Z"
 +   MACH=" "
-+   EO=" "
++   EO="-Z"
  fi
   
  ed_moptions add "F77=gfortran $MACH" >/dev/null

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