[eso-midas] 02/02: Remove files with different license (partly not even DFGS compatible)
Ole Streicher
olebole-guest at moszumanska.debian.org
Fri Apr 25 12:06:12 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 59b0b13e573923e36b7e0525934d56aae709961a
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Apr 25 13:38:39 2014 +0200
Remove files with different license (partly not even DFGS compatible)
---
debian/changelog | 2 +-
debian/copyright | 63 +++++++-
debian/patches/dfsg-free-msg_h.patch | 229 ++++++++++++++++++++++++++++++
debian/patches/propagate_buildflags.patch | 33 -----
debian/patches/series | 1 +
debian/patches/system_readline.patch | 11 --
debian/watch | 6 +-
7 files changed, 293 insertions(+), 52 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 335878c..7f6fded 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-eso-midas (13.09pl1.2-1) unstable; urgency=low
+eso-midas (13.09pl1.2+dfsg-1) unstable; urgency=low
* Initial release. (Closes: #740702)
diff --git a/debian/copyright b/debian/copyright
index 73451d1..49bb696 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,15 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name:ESO-MIDAS
-Upstream-Author: Ralf Palsa <rpalsa at eso.org>, Lars Lundin <llundin at eso.org>
+Upstream-Name: ESO-MIDAS
+Upstream-Author: Ralf Palsa <rpalsa at eso.org>, Lars Lundin <llundin at eso.org>
Source: http://www.eso.org/sci/software/esomidas/midas-distrib.html
+Files-Excluded:
+ gui/GraphLib/libsrc/uimxR5/include/msg.h
+ gui/GraphLib/libsrc/.Wcl
+ gui/GraphLib/libsrc/.Xukc
+ gui/GraphLib/libsrc/old_uimxR4
+ libsrc/readline
+ install/unix/systems/Cygwin
+ install/unix/systems/Linux_alpha
Files: * debian/*
Copyright:
@@ -9,11 +17,8 @@ Copyright:
1990 David E. Smyth,
1990 by Auto-trol Technology Corporation, Denver, Colorado,
1990 Rodney J. Whitby,
- 1988-1992, Visual Edge Software Ltd,
1990 Richard Hesketh / rlh2 at ukc.ac.uk,
1990-1991 GROUPE BULL,
- 2000 Apple Computer, Inc.,
- 1993 Daniel Boulet and RTMX Inc,
1994 Landessternwarte Heidelberg,
1995 Mark Calabretta,
1987-1992 Free Software Foundation, Inc,
@@ -37,3 +42,51 @@ License: GPL-2+
Notice: The web page claims that ESO-MIDAS
<http://www.eso.org/sci/software/esomidas/> is a registered trademark.
However, this is outdated, as the trademark ist cancelled since 1998.
+
+Files: /gui/GraphLib/libsrc/uimxR5/*
+Copyright: 1988-1992, Visual Edge Software Ltd,
+ 1993 Daniel Boulet and RTMX Inc.
+License: MIT
+ ALL RIGHTS RESERVED. Permission to use, copy, modify, and
+ distribute this software and its documentation for any purpose
+ and without fee is hereby granted, provided that the above
+ copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of Visual Edge Software not be
+ used in advertising or publicity pertaining to distribution of
+ the software without specific, written prior permission. The year
+ included in the notice is the year of the creation of the work.
+
+Files: debian/patches/dfsg-free-msg_h.patch
+Copyright: 1999, 2007 The NetBSD Foundation, Inc.
+ 1993 Daniel Boulet and RTMX Inc.
+License: BSD
+ 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.
+ .
+ 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.
diff --git a/debian/patches/dfsg-free-msg_h.patch b/debian/patches/dfsg-free-msg_h.patch
new file mode 100644
index 0000000..20efd79
--- /dev/null
+++ b/debian/patches/dfsg-free-msg_h.patch
@@ -0,0 +1,229 @@
+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/propagate_buildflags.patch b/debian/patches/propagate_buildflags.patch
index 2eaccbd..23f8e6e 100644
--- a/debian/patches/propagate_buildflags.patch
+++ b/debian/patches/propagate_buildflags.patch
@@ -44,28 +44,6 @@ Description: Propagate CFLAGS, CPPFLAGS and LDFLAGS
LLIB = -L$(LLIBDIR) -lwave2d -L$(LIBDIR) -lmidas
---- a/gui/GraphLib/libsrc/.Wcl/makefile
-+++ b/gui/GraphLib/libsrc/.Wcl/makefile
-@@ -15,7 +15,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)
-
- LLIBDIR = ../../../lib
- LIB = $(LLIBDIR)/libWc.a
---- a/gui/GraphLib/libsrc/.Xukc/makefile
-+++ b/gui/GraphLib/libsrc/.Xukc/makefile
-@@ -18,7 +18,7 @@
- INC = .
- LINC = ../../../incl
-
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) $(X11INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) $(X11INC)
-
- LLIBDIR = ../../../lib
- LIB = $(LLIBDIR)/libXukc.a
--- a/gui/XAlice/libsrc/makefile
+++ b/gui/XAlice/libsrc/makefile
@@ -13,7 +13,7 @@
@@ -196,17 +174,6 @@ Description: Propagate CFLAGS, CPPFLAGS and LDFLAGS
LIB = $(LIBDIR)/libplot.a
---- a/libsrc/readline/makefile
-+++ b/libsrc/readline/makefile
-@@ -16,7 +16,7 @@
-
- LINC=.
- INC=..
--CFLAGS = $(C_OPT) $(DEBUG) $(SYS) $(EDITFLAGS) -I$(LINC) -I$(INC)
-+CFLAGS += $(C_OPT) $(DEBUG) $(SYS) $(EDITFLAGS) -I$(LINC) -I$(INC)
-
- LIB = $(LIBDIR)/libzreadline.a
-
--- a/libsrc/st/makefile
+++ b/libsrc/st/makefile
@@ -20,7 +20,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index 93eae7f..452da26 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ syskeys.patch
resolve_gmidas_syms.patch
system_readline.patch
dotlockfile.patch
+dfsg-free-msg_h.patch
diff --git a/debian/patches/system_readline.patch b/debian/patches/system_readline.patch
index e5ee094..a11c059 100644
--- a/debian/patches/system_readline.patch
+++ b/debian/patches/system_readline.patch
@@ -21,17 +21,6 @@ Description: Use the system provided readline instead of the copy
else
exit 1
fi
---- a/libsrc/readline/makefile
-+++ b/libsrc/readline/makefile
-@@ -25,7 +25,7 @@
- history.o tilde.o xmalloc.o
-
- # DEPENDENCIES:
--all: $(LIB)
-+all:
-
- $(LIB): $(OBJ)
- $(AR) $(AR_OPT) $(LIB) $(OBJ)
--- a/install/unix/install1.sh
+++ b/install/unix/install1.sh
@@ -575,7 +575,7 @@
diff --git a/debian/watch b/debian/watch
index 78770bc..bc3c000 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,7 @@
version=3
opts=uversionmangle=\
-s/(\d\d)([A-Z][A-Z][A-Z])/$1.$2/\
-;s/JAN/01/;s/FEB/02/;s/MAR/03/;s/APR/04/;s/MAY/05/;s/JUN/06/;s/JUL/07/;s/AUG/08/;s/SEP/09/;s/OCT/10/;s/NOV/11/;s/DEC/12/ \
+s/(\d\d)([A-Z][A-Z][A-Z])/$1.$2/;\
+s/JAN/01/;s/FEB/02/;s/MAR/03/;s/APR/04/;s/MAY/05/;s/JUN/06/;\
+s/JUL/07/;s/AUG/08/;s/SEP/09/;s/OCT/10/;s/NOV/11/;s/DEC/12/,\
+dversionmangle=s/\+dfsg// \
ftp://ftp.eso.org/pub/midaspub/([0-8]\S+)/sources/ ([0-8]\S+).tar.gz debian uupdate
--
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