This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository eso-midas.
commit 0318a27456515bc913e47a5cd18bfa9ab95b5fe3
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Mar 17 15:10:28 2015 +0100
Fix a number of trivial compilation errors and warnings
---
debian/patches/fix_nonlinux_ports.patch | 28 ------------
debian/patches/fix_trivial_errors.patch | 76 +++++++++++++++++++++++++++++++++
debian/patches/series | 2 +-
3 files changed, 77 insertions(+), 29 deletions(-)
diff --git a/debian/patches/fix_nonlinux_ports.patch b/debian/patches/fix_nonlinux_ports.patch
deleted file mode 100644
index 5f11db1..0000000
--- a/debian/patches/fix_nonlinux_ports.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Use __GNU__ and __FreeBSD_kernel__
---- a/gui/GraphLib/libsrc/uimxR5/src/sp_pty.c
-+++ b/gui/GraphLib/libsrc/uimxR5/src/sp_pty.c
-@@ -23,7 +23,7 @@
-
-
-
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__)
- #include <termios.h>
-
- #if defined(__alpha__)
---- a/gui/GraphLib/libsrc/uimxR5/include/sp_pty.h
-+++ b/gui/GraphLib/libsrc/uimxR5/include/sp_pty.h
-@@ -84,12 +84,6 @@
- # include <sys/sysmacros.h>
- #endif /* sgi */
-
--/* for DG, use SYSV pty code */
--#if defined(dg88)
--# define USE_SYSV_TERMIO
--# define USE_SYSV_PGRP
--#endif /* dg88 */
--
- #ifdef __cplusplus
- extern "C" { /* C++ compatability */
- #endif /* __cplusplus */
diff --git a/debian/patches/fix_trivial_errors.patch b/debian/patches/fix_trivial_errors.patch
new file mode 100644
index 0000000..249a28d
--- /dev/null
+++ b/debian/patches/fix_trivial_errors.patch
@@ -0,0 +1,76 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Fix/circumvent some trivial errors
+--- a/gui/GraphLib/libsrc/uimxR5/src/makefile
++++ b/gui/GraphLib/libsrc/uimxR5/src/makefile
+@@ -65,7 +65,6 @@
+ subproc.o\
+ sp_utils.o\
+ sp_spmd.o\
+- sp_pty.o\
+ swidget.o \
+ t_error.o\
+ uimx.o\
+--- a/incl/proto_os.h
++++ b/incl/proto_os.h
+@@ -18,6 +18,7 @@
+
+ /* to avoid generic complains for strlen() */
+ #include <string.h>
++#include <sys/types.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+--- a/stdred/feros/incl/u_const.h
++++ b/stdred/feros/incl/u_const.h
+@@ -110,7 +110,6 @@
+
+ #define min(X, Y) (((X) < (Y)) ? (X) : (Y)) /* Minimum von X,Y */
+ #define max(X, Y) (((X) > (Y)) ? (X) : (Y)) /* Maximum von X,Y */
+-#define abs(X) (((X) >= 0) ? (X) : -(X)) /* Absolutbetrag von X */
+ #define sign(X, Y) (((Y) < 0) ? -abs(X) : abs(X)) /* Vorzeichen von */
+ /* Y mal abs(X) */
+ #define sqr(X) ((X) * (X)) /* Quadrat von X */
+--- a/stdred/ccdred/libsrc/nrmed.c
++++ b/stdred/ccdred/libsrc/nrmed.c
+@@ -59,7 +59,7 @@
+
+ extern void sortd(
+ #ifdef __STDC__
+-int n;
++int n,
+ double *da
+ #endif
+ );
+--- a/stdred/do/libsrc/ostcrea.c
++++ b/stdred/do/libsrc/ostcrea.c
+@@ -94,7 +94,7 @@
+ double otimetomjd();
+ int listtype,no,tidtemp,colfile,nenttemp,lname;
+ int kuni;
+-char cext[4];
++char cext[5];
+ char finame[128],diname[128];
+
+ /*
+--- a/stdred/mos/libsrc/misc.c
++++ b/stdred/mos/libsrc/misc.c
+@@ -43,7 +43,7 @@
+ break;
+ }
+
+- if ( (int) strstrs(file, ext) == 0 )
++ if ( strstrs(file, ext) == NULL )
+ sprintf( fileext, "%s%s", file, ext );
+ else
+ strcpy( fileext, file );
+--- a/gui/XDo/src/applic.c
++++ b/gui/XDo/src/applic.c
+@@ -307,7 +307,7 @@
+ extern swidget myerror;
+ extern int tidost;
+ int i,col,len,fin,colnew,ncol,dummy,index;
+-char label[TBL_LABLEN+1],op[2],crit[256];
++char label[TBL_LABLEN+1],op[3],crit[256];
+ char mymess[60];
+ index = strscans(descr,":#");
+ if (!descr[index]) {
diff --git a/debian/patches/series b/debian/patches/series
index e46b43c..694daa2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,5 @@ setup-debian.patch
syskeys.patch
system_readline.patch
fix_manpages.patch
-fix_nonlinux_ports.patch
remove-sys_errlist.patch
+fix_trivial_errors.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git