[eso-midas] 03/05: Adjust and delete obsolete patches
Ole Streicher
olebole-guest at moszumanska.debian.org
Tue Jul 8 18:48:21 UTC 2014
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 31d4f1e97c1c881b1140101cd3fc37e73c4e62f6
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Jul 8 19:49:17 2014 +0200
Adjust and delete obsolete patches
---
debian/patches/declare_readline_func.patch | 14 -
debian/patches/dfsg-free-msg_h.patch | 229 ----------
debian/patches/dotlockfile.patch | 24 -
debian/patches/fix_POSIX_VDISABLE.patch | 35 --
debian/patches/fix_formaterrors.patch | 44 --
debian/patches/fix_missing_haddr.patch | 14 -
debian/patches/fix_shellscripts.patch | 148 -------
debian/patches/fix_swapint.patch | 33 --
debian/patches/propagate_buildflags.patch | 688 -----------------------------
debian/patches/resolve_gmidas_syms.patch | 13 -
debian/patches/series | 10 -
debian/patches/setup-debian.patch | 3 +-
12 files changed, 1 insertion(+), 1254 deletions(-)
diff --git a/debian/patches/declare_readline_func.patch b/debian/patches/declare_readline_func.patch
deleted file mode 100644
index 433a1a9..0000000
--- a/debian/patches/declare_readline_func.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Declare completion_matches() function.
- On 32 bit systems, this function seems to be undeclared, so the compiler
- assumes to return an integer. This is fixed here.
---- a/monit/prepa2.c
-+++ b/monit/prepa2.c
-@@ -370,6 +370,7 @@
- char *text;
- int start, end;
- {
-+ extern char **completion_matches ();
- char **matches;
- char *command_generator();
- char *filename_completion_function();
diff --git a/debian/patches/dfsg-free-msg_h.patch b/debian/patches/dfsg-free-msg_h.patch
deleted file mode 100644
index 20efd79..0000000
--- a/debian/patches/dfsg-free-msg_h.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Inject the dfsg-free version of the file
- gui/GraphLib/libsrc/uimxR5/include/msg.h instead of the
- original one.
- Both files just differ by the additional Apple license of
- the original file that is not DFSG compatible.
---- /dev/null
-+++ b/gui/GraphLib/libsrc/uimxR5/include/msg.h
-@@ -0,0 +1,220 @@
-+/* $NetBSD: msg.h,v 1.24 2009/01/19 19:39:41 christos Exp $ */
-+
-+/*-
-+ * Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
-+ * All rights reserved.
-+ *
-+ * This code is derived from software contributed to The NetBSD Foundation
-+ * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
-+ * NASA Ames Research Center, and by Andrew Doran.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*
-+ * SVID compatible msg.h file
-+ *
-+ * Author: Daniel Boulet
-+ *
-+ * Copyright 1993 Daniel Boulet and RTMX Inc.
-+ *
-+ * This system call was implemented by Daniel Boulet under contract from RTMX.
-+ *
-+ * Redistribution and use in source forms, with and without modification,
-+ * are permitted provided that this entire comment appears intact.
-+ *
-+ * Redistribution in binary form may occur without any restrictions.
-+ * Obviously, it would be nice if you gave credit where credit is due
-+ * but requiring it would be too onerous.
-+ *
-+ * This software is provided ``AS IS'' without any warranties of any kind.
-+ */
-+
-+#ifndef _SYS_MSG_H_
-+#define _SYS_MSG_H_
-+
-+#include <sys/featuretest.h>
-+#include <sys/ipc.h>
-+#ifdef _KERNEL
-+#include <sys/condvar.h>
-+#include <sys/mutex.h>
-+#endif
-+
-+#ifdef _KERNEL
-+struct __msg {
-+ struct __msg *msg_next; /* next msg in the chain */
-+ long msg_type; /* type of this message */
-+ /* >0 -> type of this message */
-+ /* 0 -> free header */
-+ u_short msg_ts; /* size of this message */
-+ short msg_spot; /* location of start of msg in buffer */
-+};
-+#endif /* _KERNEL */
-+
-+#define MSG_NOERROR 010000 /* don't complain about too long msgs */
-+
-+typedef unsigned long msgqnum_t;
-+typedef size_t msglen_t;
-+
-+struct msqid_ds {
-+ struct ipc_perm msg_perm; /* operation permission strucure */
-+ msgqnum_t msg_qnum; /* number of messages in the queue */
-+ msglen_t msg_qbytes; /* max # of bytes in the queue */
-+ pid_t msg_lspid; /* process ID of last msgsend() */
-+ pid_t msg_lrpid; /* process ID of last msgrcv() */
-+ time_t msg_stime; /* time of last msgsend() */
-+ time_t msg_rtime; /* time of last msgrcv() */
-+ time_t msg_ctime; /* time of last change */
-+
-+ /*
-+ * These members are private and used only in the internal
-+ * implementation of this interface.
-+ */
-+ struct __msg *_msg_first; /* first message in the queue */
-+ struct __msg *_msg_last; /* last message in the queue */
-+ msglen_t _msg_cbytes; /* # of bytes currently in queue */
-+};
-+
-+#if defined(_NETBSD_SOURCE)
-+/*
-+ * Based on the configuration parameters described in an SVR2 (yes, two)
-+ * config(1m) man page.
-+ *
-+ * Each message is broken up and stored in segments that are msgssz bytes
-+ * long. For efficiency reasons, this should be a power of two. Also,
-+ * it doesn't make sense if it is less than 8 or greater than about 256.
-+ * Consequently, msginit in kern/sysv_msg.c checks that msgssz is a power of
-+ * two between 8 and 1024 inclusive (and panic's if it isn't).
-+ */
-+struct msginfo {
-+ int32_t msgmax; /* max chars in a message */
-+ int32_t msgmni; /* max message queue identifiers */
-+ int32_t msgmnb; /* max chars in a queue */
-+ int32_t msgtql; /* max messages in system */
-+ int32_t msgssz; /* size of a message segment
-+ (see notes above) */
-+ int32_t msgseg; /* number of message segments */
-+};
-+
-+/* Warning: 64-bit structure padding is needed here */
-+struct msgid_ds_sysctl {
-+ struct ipc_perm_sysctl msg_perm;
-+ uint64_t msg_qnum;
-+ uint64_t msg_qbytes;
-+ uint64_t _msg_cbytes;
-+ pid_t msg_lspid;
-+ pid_t msg_lrpid;
-+ time_t msg_stime;
-+ time_t msg_rtime;
-+ time_t msg_ctime;
-+ int32_t pad;
-+};
-+struct msg_sysctl_info {
-+ struct msginfo msginfo;
-+ struct msgid_ds_sysctl msgids[1];
-+};
-+#endif /* !_POSIX_C_SOURCE && !_XOPEN_SOURCE */
-+
-+#ifdef _KERNEL
-+
-+#ifndef MSGSSZ
-+#define MSGSSZ 8 /* Each segment must be 2^N long */
-+#endif
-+#ifndef MSGSEG
-+#define MSGSEG 2048 /* must be less than 32767 */
-+#endif
-+#undef MSGMAX /* ALWAYS compute MGSMAX! */
-+#define MSGMAX (MSGSSZ*MSGSEG)
-+#ifndef MSGMNB
-+#define MSGMNB 2048 /* max # of bytes in a queue */
-+#endif
-+#ifndef MSGMNI
-+#define MSGMNI 40
-+#endif
-+#ifndef MSGTQL
-+#define MSGTQL 40
-+#endif
-+
-+/*
-+ * macros to convert between msqid_ds's and msqid's.
-+ */
-+#define MSQID(ix,ds) ((ix) & 0xffff | (((ds).msg_perm._seq << 16) & 0xffff0000))
-+#define MSQID_IX(id) ((id) & 0xffff)
-+#define MSQID_SEQ(id) (((id) >> 16) & 0xffff)
-+
-+/*
-+ * Stuff allocated in machdep.h
-+ */
-+struct msgmap {
-+ short next; /* next segment in buffer */
-+ /* -1 -> available */
-+ /* 0..(MSGSEG-1) -> index of next segment */
-+};
-+
-+typedef struct kmsq {
-+ struct msqid_ds msq_u;
-+ kcondvar_t msq_cv;
-+} kmsq_t;
-+
-+extern struct msginfo msginfo;
-+extern kmsq_t *msqs; /* MSGMNI queues */
-+extern kmutex_t msgmutex;
-+
-+#define MSG_LOCKED 01000 /* Is this msqid_ds locked? */
-+
-+#define SYSCTL_FILL_MSG(src, dst) do { \
-+ SYSCTL_FILL_PERM((src).msg_perm, (dst).msg_perm); \
-+ (dst).msg_qnum = (src).msg_qnum; \
-+ (dst).msg_qbytes = (src).msg_qbytes; \
-+ (dst)._msg_cbytes = (src)._msg_cbytes; \
-+ (dst).msg_lspid = (src).msg_lspid; \
-+ (dst).msg_lrpid = (src).msg_lrpid; \
-+ (dst).msg_stime = (src).msg_stime; \
-+ (dst).msg_rtime = (src).msg_rtime; \
-+ (dst).msg_ctime = (src).msg_ctime; \
-+} while (/*CONSTCOND*/ 0)
-+
-+#endif /* _KERNEL */
-+
-+#ifndef _KERNEL
-+#include <sys/cdefs.h>
-+
-+__BEGIN_DECLS
-+int msgctl(int, int, struct msqid_ds *) __RENAME(__msgctl50);
-+int msgget(key_t, int);
-+int msgsnd(int, const void *, size_t, int);
-+ssize_t msgrcv(int, void *, size_t, long, int);
-+__END_DECLS
-+#else
-+#include <sys/systm.h>
-+
-+struct proc;
-+
-+void msginit(void);
-+int msgctl1(struct lwp *, int, int, struct msqid_ds *);
-+int msgsnd1(struct lwp *, int, const char *, size_t, int, size_t,
-+ copyin_t);
-+int msgrcv1(struct lwp *, int, char *, size_t, long, int, size_t,
-+ copyout_t, register_t *);
-+#endif /* !_KERNEL */
-+
-+#endif /* !_SYS_MSG_H_ */
diff --git a/debian/patches/dotlockfile.patch b/debian/patches/dotlockfile.patch
deleted file mode 100644
index b98b1df..0000000
--- a/debian/patches/dotlockfile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Use dotlockfile instead of lockfile.
---- a/system/unix/inmidas
-+++ b/system/unix/inmidas
-@@ -224,7 +224,7 @@
- if [ -z "$DAZUNIT" -a \( -z "$MIDOPTION" -o "$MIDOPTION" = "NOPARALLEL" -o "$SELECT_UNIT" = "AUTO" \) ]
- then
-
-- lockfile -1 -r 10 $MID_WORK/running.lock # 2> /dev/null
-+ dotlockfile -r 5 $MID_WORK/running.lock # 2> /dev/null
- if [ $? != 0 ] ; then
- DAZUNIT=99
-
---- a/system/unix/inmidas.sh
-+++ b/system/unix/inmidas.sh
-@@ -224,7 +224,7 @@
- if [ -z "$DAZUNIT" -a \( -z "$MIDOPTION" -o "$MIDOPTION" = "NOPARALLEL" -o "$SELECT_UNIT" = "AUTO" \) ]
- then
-
-- lockfile -1 -r 10 $MID_WORK/running.lock # 2> /dev/null
-+ dotlockfile -r 5 $MID_WORK/running.lock # 2> /dev/null
- if [ $? != 0 ] ; then
- DAZUNIT=99
-
diff --git a/debian/patches/fix_POSIX_VDISABLE.patch b/debian/patches/fix_POSIX_VDISABLE.patch
deleted file mode 100644
index a22e6cd..0000000
--- a/debian/patches/fix_POSIX_VDISABLE.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Dont compare _POSIX_VDISABLE in preprocessor.
- _POSIX_VDISABLE is not guaranteed to be resolvable by cpp, and
- in kfreeBSD this causes an FTBS.
---- a/libsrc/os/unix/ost.c
-+++ b/libsrc/os/unix/ost.c
-@@ -178,14 +178,16 @@
- # define _POSIX_VDISABLE -1
- #endif
-
--#if defined(_POSIX_VDISABLE) && (_POSIX_VDISABLE != -1)
-+#if defined(_POSIX_VDISABLE)
-+ if (_POSIX_VDISABLE != -1) {
-
- /* The symbol is defined so we can just use it */
- tty1.c_cc[VQUIT] = _POSIX_VDISABLE;
- tty1.c_cc[VSUSP] = _POSIX_VDISABLE;
-
--#else /* The symbol is not defined */
--
-+ } else
-+#endif
-+ {
- long temp;
-
- errno = 0; /* Make sure we can tell if fpathconf() changes errno. */
-@@ -209,7 +211,7 @@
- tty1.c_cc[VQUIT] = 0377;
- tty1.c_cc[VSUSP] = 0377;
-
--#endif
-+ }
-
- return(0);
- }
diff --git a/debian/patches/fix_formaterrors.patch b/debian/patches/fix_formaterrors.patch
deleted file mode 100644
index 3ca92af..0000000
--- a/debian/patches/fix_formaterrors.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix non-constant format strings in printf() family
---- a/gui/GraphLib/libsrc/uimxR5/src/ux_error.c
-+++ b/gui/GraphLib/libsrc/uimxR5/src/ux_error.c
-@@ -77,7 +77,7 @@
-
- format_str = UxCopyString(va_arg (args, char*));
-
-- (void) fprintf (stderr, msg_prefix);
-+ (void) fprintf (stderr, "%s", msg_prefix);
- (void) fprintf (stderr, CGETS(MS_MISC_INTERNALERRORFORMAT,
- DS_MS_MISC_INTERNALERRORFORMAT), file_name, line_num);
-
-@@ -104,7 +104,7 @@
-
- va_start (args,format_str);
-
-- (void) fprintf (stderr, msg_prefix);
-+ (void) fprintf (stderr, "%s", msg_prefix);
- (void) vfprintf (stderr, format_str, args);
-
- va_end (args);
---- a/gui/XIrspec/src/help.c
-+++ b/gui/XIrspec/src/help.c
-@@ -278,7 +278,7 @@
- FILE *fp;
-
- fp = fopen(PRINT_FILE, "w");
-- fprintf(fp, print_text);
-+ fprintf(fp, "%s", print_text);
- fclose(fp);
-
- sprintf(s, "%s %s", PRINT_COMMAND, PRINT_FILE);
---- a/prim/plot/src/plothbdf.c
-+++ b/prim/plot/src/plothbdf.c
-@@ -310,7 +310,7 @@
-
- if ( plmode == 1 )
- { (void) strcat ( label[2], name );
-- (void) sprintf( label[3], ident );
-+ (void) sprintf( label[3], "%s", ident );
- PLIDEN( plmode, label[2], label[3] );
- }
- else if ( plmode == 2 )
diff --git a/debian/patches/fix_missing_haddr.patch b/debian/patches/fix_missing_haddr.patch
deleted file mode 100644
index 73095bb..0000000
--- a/debian/patches/fix_missing_haddr.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Replace deprecated h_addr by h_addr_list[0].
- This fixes an FTBS on kfreebsd.
---- a/libsrc/os/unix/osx.c
-+++ b/libsrc/os/unix/osx.c
-@@ -517,7 +517,7 @@
- (void) strcpy(messg,"osxopen: unable to open host");
- goto error_ret0;
- }
-- memcpy ((char *) &pin.sin_addr, hp->h_addr, hp->h_length);
-+ memcpy ((char *) &pin.sin_addr, hp->h_addr_list[0], hp->h_length);
-
- if (connect (xcid, (struct sockaddr *) &pin, sizeof (pin)) < 0)
- {
diff --git a/debian/patches/fix_shellscripts.patch b/debian/patches/fix_shellscripts.patch
deleted file mode 100644
index 6c92d3d..0000000
--- a/debian/patches/fix_shellscripts.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix various problems with provided shell scripts
---- a/install/unix/select
-+++ b/install/unix/select
-@@ -187,4 +187,3 @@
- cd $MID_INSTALL
- stty echo
- exit 0
--done
---- a/install/unix/select.sh
-+++ b/install/unix/select.sh
-@@ -187,4 +187,3 @@
- cd $MID_INSTALL
- stty echo
- exit 0
--done
---- a/systab/ascii/display/ittasc.sh
-+++ b/systab/ascii/display/ittasc.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/sh
-+#!/bin/sh
- # @(#)ittasc.sh 19.1 (ESO-IPG) 02/25/03 14:30:08
- #
- # Bourne shell script ittasc.sh
---- a/systab/ascii/display/lutasc.sh
-+++ b/systab/ascii/display/lutasc.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/sh
-+#!/bin/sh
- #
- # @(#)lutasc.sh 19.1 (ESO-IPG) 02/25/03 14:30:09
- # Bourne shell script
---- a/applic/proc/fitcref.sh
-+++ b/applic/proc/fitcref.sh
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- # @(#)fitcref.sh 19.1 (ESO-IPG) 02/25/03 13:20:10
- # Shell procedure fitcref.sh
- # called from fitcref.prg as $fitcref.sh
---- a/applic/proc/fitrepf.sh
-+++ b/applic/proc/fitrepf.sh
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- # @(#)fitrepf.sh 19.1 (ESO-IPG) 02/25/03 13:20:10
- # Shell procedure fitcref.sh
- # called from fitcref.prg as $fitcref.sh
---- a/contrib/tsa/proc/tsadelcrf.sh
-+++ b/contrib/tsa/proc/tsadelcrf.sh
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- # @(#)tsadelcrf.sh 5.1 (ESO-IPG) 4/5/93 15:59:31
- #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- #.COPYRIGHT (c) 1992 European Southern Observatory and Warsaw Observatory
---- a/contrib/tsa/proc/tsaintcrf.sh
-+++ b/contrib/tsa/proc/tsaintcrf.sh
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- # @(#)tsaintcrf.sh 5.1 (ESO-IPG) 4/5/93 15:59:21
- #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- #.COPYRIGHT (c) 1992 European Southern Observatory and Warsaw Observatory
---- a/monit/devices.sh
-+++ b/monit/devices.sh
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- # -----------------------------------------------------------------------
- #
- # Bourne shell procedure devices.sh
---- a/monit/persil.sh
-+++ b/monit/persil.sh
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- cd $HOME/midwork
- rm -f Midas_*
- rm -f FORGR*
---- a/prim/help/gen_tapes.sh
-+++ b/prim/help/gen_tapes.sh
-@@ -1,4 +1,4 @@
--:
-+#!/bin/sh
- # @(#)gen_tapes.sh 19.1 (ESO-IPG) 02/25/03 14:03:22
- # -----------------------------------------------------------------------
- # Bourne shell procedure to generate output for the tapede.alq file
---- a/prim/proc/rebcref.sh
-+++ b/prim/proc/rebcref.sh
-@@ -1,4 +1,4 @@
--:
-+#!/bin/sh
- # @(#)rebcref.sh 19.1 (ESO-IPG) 02/25/03 14:09:14
- #
- # Shell procedure rebcref.sh
---- a/system/exec/ftoc_nam.sh
-+++ b/system/exec/ftoc_nam.sh
-@@ -1,4 +1,3 @@
--:
- #! /bin/sh
- # @(#)ftoc_nam.sh 19.1 (ESO-IPG) 02/25/03 14:31:08
- # .COPYRIGHT: Copyright (c) 1988 European Southern Observatory,
---- a/system/exec/hlqtohlc.sh
-+++ b/system/exec/hlqtohlc.sh
-@@ -1,4 +1,3 @@
--:
- #! /bin/sh
- # @(#)hlqtohlc.sh 19.1 (ESO-IPG) 02/25/03 14:31:08
- #
---- a/system/unix/add_sccs
-+++ b/system/unix/add_sccs
-@@ -1,4 +1,3 @@
--:
- #! /bin/sh
- # @(#)add_sccs.sh 19.1 (ESO-IPG) 02/25/03 14:31:58
-
---- a/system/unix/add_sccs.sh
-+++ b/system/unix/add_sccs.sh
-@@ -1,4 +1,3 @@
--:
- #! /bin/sh
- # @(#)add_sccs.sh 19.1 (ESO-IPG) 02/25/03 14:31:58
-
---- a/system/unix/install.sh
-+++ b/system/unix/install.sh
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- # @(#)install.sh 19.1 (ESO-IPG) 02/25/03 14:31:59
- #
- # Installation script for MIDAS from CD-ROM with binaries.
---- a/system/unix/nmgrep
-+++ b/system/unix/nmgrep
-@@ -1,4 +1,4 @@
--:
-+#!/bin/sh
- # @(#)nmgrep.sh 19.1 (ESO-IPG) 02/25/03 14:32:00
- pattern=$1
- shift
---- a/system/unix/nmgrep.sh
-+++ b/system/unix/nmgrep.sh
-@@ -1,4 +1,4 @@
--:
-+#!/bin/sh
- # @(#)nmgrep.sh 19.1 (ESO-IPG) 02/25/03 14:32:00
- pattern=$1
- shift
---- a/system/unix/setmidas.sh
-+++ b/system/unix/setmidas.sh
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- #
- # @(#)setmidas.sh 19.1 (ESO-IPG) 02/25/03 14:32:00
- # .COPYRIGHT: Copyright (c) 1988 European Southern Observatory,
diff --git a/debian/patches/fix_swapint.patch b/debian/patches/fix_swapint.patch
deleted file mode 100644
index 6ca64d9..0000000
--- a/debian/patches/fix_swapint.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: For determination of endianess, use <stdint.h>
- The original code uses "long" for the determination of swapping in
- integer. This works fine on 32 bit computers, and accidently works
- on 64 bit little endian computers. 64 bit big endian computers (s390)
- fail here. Therefore, integers with deterministic lengths (C99) are used.
---- a/system/machine/computer.c
-+++ b/system/machine/computer.c
-@@ -84,6 +84,8 @@
- #define DEBUG 0 /* Switch to 1 to get hexa patterns */
- #endif
-
-+#include <stdint.h>
-+
- double ldexp();
-
- static char c[80]; /* ... Must be aligned ... */
-@@ -278,13 +280,13 @@
- /* Check Swapping */
-
- i = ('1'<<bitsperbyte) | '2';
-- *(short *)c = i, c[2] = 0;
-+ *(int16_t *)c = i, c[2] = 0;
- printf("\n#define SWAPSHORT\t%s\n", c);
-
- i = ('1'<<bitsperbyte) | '2';
- i = (i<<bitsperbyte) | '3';
- i = (i<<bitsperbyte) | '4';
-- *(long *)c = i, c[4] = 0;
-+ *(int32_t *)c = i, c[4] = 0;
- printf("#define SWAPINT\t\t%s\n", c);
-
- /* Find out Dynamic range of Floating-Point */
diff --git a/debian/patches/propagate_buildflags.patch b/debian/patches/propagate_buildflags.patch
deleted file mode 100644
index 23f8e6e..0000000
--- a/debian/patches/propagate_buildflags.patch
+++ /dev/null
@@ -1,688 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Propagate CFLAGS, CPPFLAGS and LDFLAGS
---- a/contrib/template/libsrc/makefile
-+++ b/contrib/template/libsrc/makefile
-@@ -14,7 +14,7 @@
-
- include ../../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-
- LIB = $(LLIBDIR)/libtemplate.a
-
---- a/contrib/template/src/makefile
-+++ b/contrib/template/src/makefile
-@@ -15,7 +15,7 @@
-
- M = ../../exec
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-
- #LLIB = -L$(LLIBDIR) -ltemplate -L$(LIBDIR) -lmidas
- LLIB = -L$(LLIBDIR) -L$(LIBDIR) -lmidas
---- a/contrib/wavelet/libsrc/makefile
-+++ b/contrib/wavelet/libsrc/makefile
-@@ -14,7 +14,7 @@
-
- include ../../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-
- LIB = $(LLIBDIR)/libwave2d.a
-
---- a/contrib/wavelet/src/makefile
-+++ b/contrib/wavelet/src/makefile
-@@ -15,7 +15,7 @@
-
- M = ../../exec
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-
- LLIB = -L$(LLIBDIR) -lwave2d -L$(LIBDIR) -lmidas
-
---- a/gui/XAlice/libsrc/makefile
-+++ b/gui/XAlice/libsrc/makefile
-@@ -13,7 +13,7 @@
-
- include ../../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) $(X11INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) $(X11INC)
-
- LIBOUT = ../../lib/libmgauss.a
-
---- a/gui/XEchelle/libsrc/makefile
-+++ b/gui/XEchelle/libsrc/makefile
-@@ -20,7 +20,7 @@
- INC = ../../GraphLib/libsrc/$(UIMX)/include
- MINC = ../../../incl
-
--CFLAGS = $(C_OPT) $(DEBUG) $(GUI_OPT) $(SYS) -I$(LINC) -I$(INC) -I$(MINC) \
-+CFLAGS += $(C_OPT) $(DEBUG) $(GUI_OPT) $(SYS) -I$(LINC) -I$(INC) -I$(MINC) \
- $(X_CFLAGS) $(MOTIF_CFLAGS) $(XMINC) $(X11INC)
-
- LIB = $(LLIBDIR)/libxech.a
---- a/install/unix/systems/AIX/libsrc/os/unix/makefile
-+++ b/install/unix/systems/AIX/libsrc/os/unix/makefile
-@@ -15,7 +15,7 @@
- include ../../../default.mk
-
- LINC = ../../../incl
--CFLAGS = $(C_OPT) $(DEBUG) $(SH_OPT) $(OSSYS) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SH_OPT) $(OSSYS) $(SYS) -I$(LINC) -I$(INC)
-
- LIB = $(LIBDIR)/libos.a
-
---- a/install/unix/test/makefile
-+++ b/install/unix/test/makefile
-@@ -22,7 +22,7 @@
- XWLIB = $(X11_LIBPATH) -lX11
- XMLIB = $(X11_LIBPATH) $(MOTIF_LIBPATH) $(X_LIBS)
-
--CFLAGS = $(C_OPT) $(DEBUG) $(LSYS) $(SYS) $(EDITFLAGS) $(OSSYS) $(UNDEFS) -I$(LINC) -I$(INC) $(X11INC) $(XMINC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(LSYS) $(SYS) $(EDITFLAGS) $(OSSYS) $(UNDEFS) -I$(LINC) -I$(INC) $(X11INC) $(XMINC)
-
- .for.f:
- rm -f $*.f
---- a/libsrc/agl/makefile
-+++ b/libsrc/agl/makefile
-@@ -27,7 +27,7 @@
-
- include ../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SH_OPT) $(OSSYS) $(SYS) -I$(INC) $(X11INC) -DMIDAS
-+CFLAGS += $(C_OPT) $(DEBUG) $(SH_OPT) $(OSSYS) $(SYS) -I$(INC) $(X11INC) -DMIDAS
-
- LIB = $(LIBDIR)/libagl3.a
- M = ../../system/exec
-@@ -150,7 +150,7 @@
- ag_wdef.o : ag_wdef.c $(HFILES)
-
- aglinit.o: aglinit.c $(HFILES)
-- $(CC) $(CFLAGS) $(WINDOW) $(DRIVERS) $(CLINK) aglinit.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(WINDOW) $(DRIVERS) $(CLINK) aglinit.c
-
- aglchar.o: aglchar.c aglfonts.c $(HFILES)
- agldash.o: agldash.c $(HFILES)
---- a/libsrc/display/makefile
-+++ b/libsrc/display/makefile
-@@ -10,7 +10,7 @@
-
- include ../../local/default.mk
-
--CFLAGS = $(C_OPT) $(SH_OPT) $(DEBUG) $(SYS) -I$(INC) $(X11INC)
-+CFLAGS += $(C_OPT) $(SH_OPT) $(DEBUG) $(SYS) -I$(INC) $(X11INC)
-
- LIB = $(LIBDIR)/libdsp.a
-
---- a/libsrc/ftoc-new/makefile
-+++ b/libsrc/ftoc-new/makefile
-@@ -20,7 +20,7 @@
-
- C_OPT = $(K_OPT)
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SH_OPT) $(SYS) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SH_OPT) $(SYS) -I$(INC)
-
- LIB = $(LIBDIR)/libftoc.a
-
---- a/libsrc/ftoc-old/makefile
-+++ b/libsrc/ftoc-old/makefile
-@@ -19,7 +19,7 @@
-
- include ../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SH_OPT) $(SYS) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SH_OPT) $(SYS) -I$(INC)
-
- LIB = $(LIBDIR)/libftoc.a
-
---- a/libsrc/idi/cidi/x11/makefile
-+++ b/libsrc/idi/cidi/x11/makefile
-@@ -19,7 +19,7 @@
-
- include ../../../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(OSSYS) $(SYS) -I$(INC) $(X11INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(OSSYS) $(SYS) -I$(INC) $(X11INC)
-
- LIB = $(LIBDIR)/libidi.a
-
---- a/libsrc/os/unix/makefile
-+++ b/libsrc/os/unix/makefile
-@@ -19,7 +19,7 @@
-
- include ../../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(MEM_OPT) $(SH_OPT) $(OSSYS) $(SYS) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(MEM_OPT) $(SH_OPT) $(OSSYS) $(SYS) -I$(INC)
-
- LIB = $(LIBDIR)/libos.a
-
---- a/libsrc/plot/makefile
-+++ b/libsrc/plot/makefile
-@@ -14,7 +14,7 @@
-
- include ../../local/default.mk
-
--CFLAGS = $(C_OPT) $(SH_OPT) $(DEBUG) $(SYS) -I$(INC)
-+CFLAGS += $(C_OPT) $(SH_OPT) $(DEBUG) $(SYS) -I$(INC)
-
- LIB = $(LIBDIR)/libplot.a
-
---- a/libsrc/st/makefile
-+++ b/libsrc/st/makefile
-@@ -20,7 +20,7 @@
-
- include ../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(MEM_OPT) $(SH_OPT) $(SYS) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(MEM_OPT) $(SH_OPT) $(SYS) -I$(INC)
-
- LIB = $(LIBDIR)/libst.a
-
---- a/libsrc/tbl/makefile
-+++ b/libsrc/tbl/makefile
-@@ -21,7 +21,7 @@
-
- include ../../local/default.mk
-
--CFLAGS = $(C_OPT) $(SH_OPT) $(DEBUG) $(SYS) -I$(INC)
-+CFLAGS += $(C_OPT) $(SH_OPT) $(DEBUG) $(SYS) -I$(INC)
-
- HEADT = $(INC)/tblsys.h $(INC)/tbldef.h $(INC)/tblerr.h
-
---- a/monit/makefile
-+++ b/monit/makefile
-@@ -22,7 +22,7 @@
-
- include ../local/default.mk
-
--CFLAGS = $(C_OPT) $(EDITSWITCH) $(DEBUG) $(MEM_OPT) $(SYS) -I$(INC) -I../libsrc
-+CFLAGS += $(C_OPT) $(EDITSWITCH) $(DEBUG) $(MEM_OPT) $(SYS) -I$(INC) -I../libsrc
-
- LLIB = libprep.a -L$(LIBDIR) -lmidas
- LLIB1 = libprep.a -L$(LIBDIR) -lgen -lxcon -lgmidas -lmidas
-@@ -124,7 +124,7 @@
-
- newcom.out: newcom.in newcom.exe
- $(RM) newcom.bin newcom.out
-- ./newcom.exe
-+ LD_LIBRARY_PATH=../lib ./newcom.exe
-
- syskeys.unix: syskeys.datorg
- $(RM) $@
---- a/prim/dio/libsrc/makefile
-+++ b/prim/dio/libsrc/makefile
-@@ -14,7 +14,7 @@
-
- include ../../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(MEM_OPT) $(SH_OPT) $(SYS) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(MEM_OPT) $(SH_OPT) $(SYS) -I$(INC)
-
-
- LIB = $(LIBDIR)/libdio.a
---- a/prim/display/libsrc/makefile
-+++ b/prim/display/libsrc/makefile
-@@ -10,7 +10,7 @@
-
- include ../../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(INC)
-
- LIB = $(LIBDIR)/libdisp.a
-
---- a/prim/general/libsrc/makefile
-+++ b/prim/general/libsrc/makefile
-@@ -16,7 +16,7 @@
- include ../../../local/default.mk
-
-
--CFLAGS = $(C_OPT) $(DEBUG) $(UNDEFS) $(SYS) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(UNDEFS) $(SYS) -I$(INC)
-
- LIB = $(LIBDIR)/libgen.a
-
---- a/prim/plot/libsrc/makefile
-+++ b/prim/plot/libsrc/makefile
-@@ -13,7 +13,7 @@
-
- include ../../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(INC)
-
- LIB = $(LIBDIR)/libsubplot.a
-
---- a/prim/plot/src/makefile
-+++ b/prim/plot/src/makefile
-@@ -18,7 +18,7 @@
- include ../../../local/default.mk
-
- M = ../../exec
--CFLAGS = $(C_OPT) $(DEBUG) $(UNDEFS) $(SYS) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(UNDEFS) $(SYS) -I$(INC)
-
- #LLIB1 = -L$(LIBDIR) -lsubplot -ldisp -lgen -lgmidas -lctab -ltw3 -ltc3 -lmidas
- #
---- a/prim/table/libsrc/makefile
-+++ b/prim/table/libsrc/makefile
-@@ -15,7 +15,7 @@
-
- include ../../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(UNDEFS) $(SYS) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(UNDEFS) $(SYS) -I$(INC)
-
- INCT = $(INC)/tablet.inc
- INCS = $(INC)/tables.inc $(INC)/tabled.inc
---- a/stdred/do/libsrc/makefile
-+++ b/stdred/do/libsrc/makefile
-@@ -15,7 +15,7 @@
-
- include ../../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-
- LIB = $(LLIBDIR)/libdo.a
-
---- a/stdred/echelle/libsrc/makefile
-+++ b/stdred/echelle/libsrc/makefile
-@@ -17,7 +17,7 @@
-
- include ../../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-
- LIB = $(LLIBDIR)/libech_nr.a
-
---- a/stdred/echelle/src/makefile
-+++ b/stdred/echelle/src/makefile
-@@ -22,7 +22,7 @@
- #TABLEDIR = ../../../prim/table/libsrc
- TABLEDIR = ../../../libsrc/math
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-
- LLIB = -L$(LIBDIR) -lmidas
- LLIB1 = -L$(LLIBDIR) -lspec -L$(LIBDIR) -lftab -lgen -lmidas
---- a/stdred/feros/libsrc/makefile
-+++ b/stdred/feros/libsrc/makefile
-@@ -22,7 +22,7 @@
- # DEFINITIONS:
-
- #DEBUG =
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-
- #LLIBDIR = ../lib
-
---- a/stdred/feros/src/makefile
-+++ b/stdred/feros/src/makefile
-@@ -24,7 +24,7 @@
- #C_OPT = -O
- #DEBUG = -g
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-
- LLIB = -L$(LIBDIR) -lmidas -lm
- LLIB1 = -L$(LLIBDIR) -lech -L$(LIBDIR) -lftab -lgen -lmidas -lm
---- a/stdred/long/src/makefile
-+++ b/stdred/long/src/makefile
-@@ -19,7 +19,7 @@
- M = ../../exec
- SPE_INC = ../../spec/incl
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) -I$(SPE_INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) -I$(SPE_INC)
-
- LLIB = -L$(LIBDIR) -lmidas
-
---- a/stdred/mmf/src/makefile
-+++ b/stdred/mmf/src/makefile
-@@ -19,7 +19,7 @@
-
- M = ../../exec
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-
- LLIB = -L$(LIBDIR) -lmidas
- LIBS = $(LIBDIR)/libmidas.a
---- a/stdred/mos/libsrc/makefile
-+++ b/stdred/mos/libsrc/makefile
-@@ -23,7 +23,7 @@
-
- C_OPT = $(K_OPT)
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-
- LIB = $(LLIBDIR)/libmos.a
-
---- a/stdred/mos/src/makefile
-+++ b/stdred/mos/src/makefile
-@@ -24,9 +24,9 @@
-
- SPEC_INC = ../../spec/incl
-
--#CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) -Aa -D_HPUX_SOURCE
-+#CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) -Aa -D_HPUX_SOURCE
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) -I$(SPEC_INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) -I$(SPEC_INC)
-
- ## LLIB = -L$(LIBDIR) -lmidas -lm
- ## LLIB1 = -L$(LLIBDIR) -lmos -L$(LIBDIR) -lmidas -lm
---- a/stdred/optopus/src/makefile
-+++ b/stdred/optopus/src/makefile
-@@ -19,7 +19,7 @@
-
- M = ../../exec
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-
- LLIB = -L$(LLIBDIR) -lopto -L$(LIBDIR) -lgen -lmidas
-
---- a/stdred/spec/libsrc/makefile
-+++ b/stdred/spec/libsrc/makefile
-@@ -17,7 +17,7 @@
-
- include ../../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-
- LIB = $(LLIBDIR)/libspec.a
-
---- a/stdred/spec/src/makefile
-+++ b/stdred/spec/src/makefile
-@@ -20,7 +20,7 @@
-
- M = ../../exec
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-
- LLIB1 = -L$(LLIBDIR) -lspec -L$(LIBDIR) -lftab -lmidas
-
---- a/system/idiserv/libsrc/makefile
-+++ b/system/idiserv/libsrc/makefile
-@@ -20,7 +20,7 @@
-
- include ../../../local/default.mk
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SH_OPT) $(SYS) -I$(INC) $(X11INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SH_OPT) $(SYS) -I$(INC) $(X11INC)
-
- LIBOUT= $(LIBDIR)/libidicl.a
-
---- a/system/idiserv/src/makefile
-+++ b/system/idiserv/src/makefile
-@@ -25,7 +25,7 @@
-
- M = ../../exec
-
--CFLAGS = $(C_OPT) $(DEBUG) $(MEM_OPT) $(SYS) -I$(INC) $(X11INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(MEM_OPT) $(SYS) -I$(INC) $(X11INC)
-
- LLIB0= -L$(LIBDIR) -lmidas
- LLIB1 = -L$(LIBDIR) -lgmidas -lmidas
---- a/monit/testmake
-+++ b/monit/testmake
-@@ -17,7 +17,7 @@
- C_OPT =
- F_OPT =
- SYS =
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
- FFLAGS = $(F_OPT) $(DEBUG) -c
- EXFLAGS = -f
-
---- a/prim/table/libsrc/makefile.c-only
-+++ b/prim/table/libsrc/makefile.c-only
-@@ -28,7 +28,7 @@
- C_OPT =
- F_OPT =
- SYS =
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
- FFLAGS = $(F_OPT) $(DEBUG) -c
- EXFLAGS = -f
-
---- a/install/unix/default_mk
-+++ b/install/unix/default_mk
-@@ -26,10 +26,10 @@
- SHELL=/bin/sh
- CC = cc
- CP = cp
--LDCC = cc
-+LDCC = cc $(LDFLAGS)
- F77 = f77
- LD77_CMD = f77
--LD77_OPT =
-+LD77_OPT = $(LDFLAGS)
- LD77 = $(LD77_CMD) $(LD77_OPT)
- RANLIB = ranlib
- STRIP = strip
-@@ -42,7 +42,7 @@
-
-
- CLINK=-c
--LD_OPT =
-+LD_OPT = $(LDFLAGS)
- DEBUG =
- C_OPT =
- F_OPT=
-@@ -51,7 +51,7 @@
- SH_CMD = echo
- SH_OPT =
- SH_EXT = so.8.1
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) $(VARARGS) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) $(VARARGS) -I$(INC)
- FFLAGS = $(F_OPT) $(DEBUG) -c
- EFLAGS = $(E_OPT) -I$(INC) -I$(LINC) -f
- EXFLAGS = -f
-@@ -64,7 +64,7 @@
- MOTIF_LIBPATH =
- XWLIB = $(X11_LIBPATH) -lX11
- VMSLIB =
--CPPLINE=$(CC) $(CFLAGS) $(CLINK) $<
-+CPPLINE=$(CC) $(CPPFLAGS) $(CFLAGS) $(CLINK) $<
- XOPEN_LIBS=
-
- # RULES:
-@@ -80,11 +80,11 @@
- $(F77) $(FFLAGS) $<
- .fc.o:
- $(FORIF) $(FORIF_OPT) $< $*.c
-- $(CC) $(CFLAGS) $(CLINK) $*.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(CLINK) $*.c
- .fc.c:
- $(FORIF) $(FORIF_OPT) $< $@
- .c.o:
-- $(CC) $(CFLAGS) $(CLINK) $<
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(CLINK) $<
- .o.mod:
- $(CP) $< $*.mod
- .sh:
---- a/gui/GraphLib/libsrc/Comm/makefile
-+++ b/gui/GraphLib/libsrc/Comm/makefile
-@@ -19,7 +19,7 @@
- LLIBDIR = ../../../lib
- LIB = $(LLIBDIR)/libcom.a
-
--CFLAGS = $(C_OPT) $(DEBUG) $(GUI_OPT) $(SYS) \
-+CFLAGS += $(C_OPT) $(DEBUG) $(GUI_OPT) $(SYS) \
- -I$(LINC) -I$(INC) $(X11INC) $(XMINC)
-
- OBJ = dialog.o misc.o SetResources.o filelist.o
---- a/gui/GraphLib/libsrc/uimxR5/src/makefile
-+++ b/gui/GraphLib/libsrc/uimxR5/src/makefile
-@@ -33,7 +33,7 @@
-
- INCLUDES = -I. -I../include -I$(INC) $(X11INC) $(XMINC)
-
--CFLAGS = $(C_OPT) $(DEBUG) $(GUI_OPT) $(INCLUDES) \
-+CFLAGS += $(C_OPT) $(DEBUG) $(GUI_OPT) $(INCLUDES) \
- -DRUNTIME -DUSE_STDLIB -DMOTIF_WIDGETS -DSAFE_MALLOC \
- -D$(CATALOG)_CATALOG -D_PTY_DRIVER
-
---- a/system/ftoc-new/makefile
-+++ b/system/ftoc-new/makefile
-@@ -46,8 +46,8 @@
- $(STRIP) $@
-
- $(M)/ftoc_comm.exe: $(INC)/ftoc_commc.h ftoc_commf.o ftoc_commff.o ftoc_commc.c
-- $(CC) $(CFLAGS) -c ftoc_commc.c $(DEV_NULL); \
-- $(CC) $(CFLAGS) -c ftoc_commap.c $(DEV_NULL); \
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c ftoc_commc.c $(DEV_NULL); \
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c ftoc_commap.c $(DEV_NULL); \
- $(LD77_CMD) $(OBJ3) $(SLIB) -o $@ $(DEV_NULL)
-
- $(M)/ftoc_generic.exe:: $(OBJ5)
---- a/system/machine/makefile
-+++ b/system/machine/makefile
-@@ -31,8 +31,8 @@
- $(STRIP) $@
-
- computer.o: computer.c
-- $(CC) $(CFLAGS) -c computer.c $(DEV_NULL) || \
-- $(CC) $(CFLAGS) -DNO_FLOAT_H -c computer.c $(DEV_NULL)
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c computer.c $(DEV_NULL) || \
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -DNO_FLOAT_H -c computer.c $(DEV_NULL)
-
- $(INC)/computer.h: $(M)/computer.exe
- $(M)/computer.exe $@
---- a/gui/XBatch/src/makefile
-+++ b/gui/XBatch/src/makefile
-@@ -46,7 +46,7 @@
- X_CFLAGS =
- MOTIF_CFLAGS =
-
--CFLAGS = $(C_OPT) $(DEBUG) $(GUI_OPT) \
-+CFLAGS += $(C_OPT) $(DEBUG) $(GUI_OPT) \
- -I$(LINC) -I$(INC) -I$(UX_DIR)/include \
- $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
- $(XMINC) $(X11INC)
---- a/gui/XAlice/src/makefile
-+++ b/gui/XAlice/src/makefile
-@@ -53,7 +53,7 @@
- X_CFLAGS =
- MOTIF_CFLAGS =
-
--CFLAGS = $(C_OPT) $(DEBUG) $(GUI_OPT) \
-+CFLAGS += $(C_OPT) $(DEBUG) $(GUI_OPT) \
- -I$(LINC) -I$(INC) -I$(GINC) -I$(UX_DIR)/include \
- $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
- $(XMINC) $(X11INC)
---- a/gui/XDisplay/src/makefile
-+++ b/gui/XDisplay/src/makefile
-@@ -47,7 +47,7 @@
- X_CFLAGS =
- MOTIF_CFLAGS =
-
--CFLAGS = $(C_OPT) $(DEBUG) $(GUI_OPT) \
-+CFLAGS += $(C_OPT) $(DEBUG) $(GUI_OPT) \
- -I$(LINC) -I$(INC) -I$(UX_DIR)/include \
- $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
- $(XMINC) $(X11INC)
---- a/gui/XDo/src/makefile
-+++ b/gui/XDo/src/makefile
-@@ -54,7 +54,7 @@
- X_CFLAGS =
- MOTIF_CFLAGS =
-
--CFLAGS = $(C_OPT) $(DEBUG) $(GUI_OPT) \
-+CFLAGS += $(C_OPT) $(DEBUG) $(GUI_OPT) \
- -I$(LINC) -I$(INC) -I$(UX_DIR)/include \
- $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
- $(XMINC) $(X11INC)
---- a/gui/XEchelle/src/makefile
-+++ b/gui/XEchelle/src/makefile
-@@ -59,7 +59,7 @@
- X_CFLAGS =
- MOTIF_CFLAGS =
-
--CFLAGS = $(C_OPT) $(DEBUG) $(GUI_OPT) \
-+CFLAGS += $(C_OPT) $(DEBUG) $(GUI_OPT) \
- $(LINC) -I$(INC) -I$(UX_DIR)/include \
- $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
- $(XMINC) $(X11INC)
---- a/gui/XFilter/src/makefile
-+++ b/gui/XFilter/src/makefile
-@@ -80,7 +80,7 @@
- X_CFLAGS =
- MOTIF_CFLAGS =
-
--CFLAGS = $(C_OPT) $(DEBUG) $(GUI_OPT) \
-+CFLAGS += $(C_OPT) $(DEBUG) $(GUI_OPT) \
- -I$(LINC) -I$(INC) -I$(GINC) -I$(UX_DIR)/include \
- $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
- $(XMINC) $(X11INC)
---- a/gui/XHelp/src/makefile
-+++ b/gui/XHelp/src/makefile
-@@ -49,7 +49,7 @@
- X_CFLAGS =
- MOTIF_CFLAGS =
-
--CFLAGS = $(C_OPT) $(DEBUG) $(GUI_OPT) \
-+CFLAGS += $(C_OPT) $(DEBUG) $(GUI_OPT) \
- -I$(LINC) -I$(INC) -I$(UX_DIR)/include \
- $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
- $(XMINC) $(X11INC)
---- a/gui/XIdent/src/makefile
-+++ b/gui/XIdent/src/makefile
-@@ -41,7 +41,7 @@
- X_CFLAGS =
- MOTIF_CFLAGS =
-
--CFLAGS = $(C_OPT) $(DEBUG) $(GUI_OPT) \
-+CFLAGS += $(C_OPT) $(DEBUG) $(GUI_OPT) \
- -I$(LINC) -I$(INC) -I$(UX_DIR)/include \
- $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
- $(XMINC) $(X11INC)
---- a/gui/XIrspec/src/makefile
-+++ b/gui/XIrspec/src/makefile
-@@ -50,7 +50,7 @@
- X_CFLAGS =
- MOTIF_CFLAGS =
-
--CFLAGS = $(C_OPT) $(DEBUG) $(GUI_OPT) \
-+CFLAGS += $(C_OPT) $(DEBUG) $(GUI_OPT) \
- -I$(LINC) -I$(INC) -I$(UX_DIR)/include \
- $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
- $(XMINC) $(X11INC)
---- a/gui/XLong/src/makefile
-+++ b/gui/XLong/src/makefile
-@@ -53,7 +53,7 @@
- X_CFLAGS =
- MOTIF_CFLAGS =
-
--CFLAGS = $(C_OPT) $(DEBUG) $(GUI_OPT)\
-+CFLAGS += $(C_OPT) $(DEBUG) $(GUI_OPT)\
- -I$(LINC) -I$(INC) -I$(UX_DIR)/include \
- $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
- $(XMINC) $(X11INC)
---- a/applic/general/etc/makefile
-+++ b/applic/general/etc/makefile
-@@ -16,7 +16,7 @@
-
- all: clean
- @(PCK=`pwd | sed -e 's/\/etc$$//' -e 's/^.*\///'`; \
-- for file in *.ctx; \
-+ for file in `ls *.ctx`; \
- do (cd $(CTXDIR); $(LN) ../applic/$$PCK/etc/$$file $$file;) \
- done)
-
diff --git a/debian/patches/resolve_gmidas_syms.patch b/debian/patches/resolve_gmidas_syms.patch
deleted file mode 100644
index fc1699d..0000000
--- a/debian/patches/resolve_gmidas_syms.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Link the midas lib to libgmidas to resolve its symbols
---- a/lib/makefile
-+++ b/lib/makefile
-@@ -82,7 +82,7 @@
- $(AR) $(AR_OPT) $(LIBGMIDAS) *.o
- rm -f __*
- $(RANLIB) $(LIBGMIDAS)
-- $(SH_CMD) -o $(LIBGMIDAS_SH) *.o $(DEV_NULL)
-+ $(SH_CMD) -o $(LIBGMIDAS_SH) *.o -L -lmidas $(DEV_NULL)
- rm -f *.o
-
- clean:
diff --git a/debian/patches/series b/debian/patches/series
index 420bb65..2b8b631 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,16 +1,6 @@
output-to-stdout.patch
setup-debian.patch
writting.patch
-fix_shellscripts.patch
-propagate_buildflags.patch
-fix_formaterrors.patch
syskeys.patch
-resolve_gmidas_syms.patch
system_readline.patch
-dotlockfile.patch
-dfsg-free-msg_h.patch
fix_manpages.patch
-fix_missing_haddr.patch
-fix_POSIX_VDISABLE.patch
-fix_swapint.patch
-declare_readline_func.patch
diff --git a/debian/patches/setup-debian.patch b/debian/patches/setup-debian.patch
index 8a9f285..7df6139 100644
--- a/debian/patches/setup-debian.patch
+++ b/debian/patches/setup-debian.patch
@@ -50,9 +50,8 @@ Description: Debian specific changes
else
echo installing Midas on a 64 bit system
- MACH="-m64"
-- EO="-Z"
+ MACH=" "
-+ EO="-Z"
+ 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
More information about the debian-science-commits
mailing list