Skip to content
Commits on Source (10)
Show whitespace changes
Inline Side-by-side
LICENSE
View file @ c08762e9
......@@ -41,38 +41,8 @@ New files written by 3i are under this copyright:
representations about the suitability of this software for any purpose.
It is provided "as is" without express or implied warranty.
===============================================================================
ogdi/c-api/ecshash.c is:
* Copyright (c) 1991-1993 The Regents of the University of California.
* Copyright (c) 1994 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
===============================================================================
ogdi/c-api/ecsregex.c is:
* Copyright (c) 1986 by University of Toronto.
* Written by Henry Spencer. Not derived from licensed software.
*
* Permission is granted to anyone to use this software for any
* purpose on any computer system, and to redistribute it freely,
* subject to the following restrictions:
*
* 1. The author is not responsible for the consequences of use of
* this software, no matter how awful, even if they arise
* from defects in it.
*
* 2. The origin of this software must not be misrepresented, either
* by explicit claim or by omission.
*
* 3. Altered versions must be plainly marked as such, and must not
* be misrepresented as being the original software.
===============================================================================
ogdi/c-api/marix.c is:
......
NEWS
View file @ c08762e9
OGDI Core News
==============
View the ChangeLog file for detailed, file by file notes on changes. The
NEWS file is just used to sumarize major changes, and new features.
The NEWS file is just used to sumarize major changes, and new features.
4.1.0
=====
o Remove DTED driver that used the ecsrregex.c functionality removed in the
below bullet.
o Remove ogdi/c-api/ecshash.c and ogdi/c-api/ecsregex.c, which were considered
incompatible of DFSG & OSD (https://github.com/libogdi/ogdi/issues/13)
4.0.0
=====
......
README
View file @ c08762e9
......@@ -85,12 +85,12 @@ $TOPDIR/bin/$TARGET is in the LD_LIBRARY_PATH on Unix.
To use in local mode try a command like:
ogdi_info -u gltp:/dted/d:/toronto/dted -f Matrix -l 'DTED(DISK)' -dl
ogdi_info -u gltp:/vrf//home/even/data/vm2alv2_texash/texashd:/toronto/dted
To use via the server, run gltpd.exe first in the background. On windows, run
portmap.exe before running gltpd.exe. Then use a command like:
ogdi_info -u gltp://localhost/dted/d:/toronto/dted -f Matrix -l 'DTED(DISK)' -dl
ogdi_info -u gltp://localhost/vrf//home/even/data/vm2alv2_texash/texashd:/toronto/dted
......
configure
View file @ c08762e9
......@@ -2078,9 +2078,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
OGDI_VERSION=4.0.0
OGDI_VERSION=4.1.0
OGDI_MAJOR=4
OGDI_MINOR=0
OGDI_MINOR=1
......
configure.ac
View file @ c08762e9
dnl Process this file with autoconf to produce a configure script.
AC_INIT(config/unix.mak)
OGDI_VERSION=4.0.0
OGDI_VERSION=4.1.0
OGDI_MAJOR=4
OGDI_MINOR=0
OGDI_MINOR=1
AC_SUBST(OGDI_VERSION)
AC_SUBST(OGDI_MAJOR)
......
debian/changelog
View file @ c08762e9
ogdi-dfsg (4.1.0+ds-1~exp1) experimental; urgency=medium
* Team upload.
* New upstream release.
* Also exclude win32 files from repacked upstream tarball.
* Drop license & copyright for ecshash.c & ecsregex.c, removed upstream.
* Refresh patches.
* Fix package name in symbols Build-Depends-Package field.
* Rename library package for SONAME bump.
* Update symbols for 4.1.0.
-- Bas Couwenberg <sebastic@debian.org> Sat, 20 Apr 2019 14:09:37 +0200
ogdi-dfsg (4.0.0+ds-1~exp4) experimental; urgency=medium
* Team upload.
......
debian/control
View file @ c08762e9
......@@ -18,7 +18,7 @@ Homepage: http://ogdi.sourceforge.net/
Package: libogdi-dev
Architecture: any
Section: libdevel
Depends: libogdi4.0 (= ${binary:Version}),
Depends: libogdi4.1 (= ${binary:Version}),
${misc:Depends}
Suggests: pkg-config
Breaks: libogdi3.2-dev (<< 4.0.0)
......@@ -35,7 +35,7 @@ Description: Open Geographic Datastore Interface Library -- development
This package contains the development files to build OGDI enabled
programs.
Package: libogdi4.0
Package: libogdi4.1
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
......
debian/copyright
View file @ c08762e9
......@@ -3,8 +3,10 @@ Upstream-Name: OGDI
Upstream-Contact: Frank Warmerdam et al. <warmerdam@pobox.com>
Source: https://github.com/libogdi/ogdi
Embedded copies of 3rd party code are excluded from the repacked upstream
tarball.
tarball. As are some problematic files only used on Windows.
Files-Excluded: external/*
include/win32/*
lib/win32/*
Files: *
Copyright: 1995-1997, Logiciels et Applications Scientifiques (L.A.S.), Inc.
......@@ -25,15 +27,6 @@ Comment:This software is available under the following "MIT Style" license,
option is discussed in more detail in shapelib.html.
License: MIT or LGPL-2.1+
Files: ogdi/c-api/ecshash.c
Copyright: 1991-1993, The Regents of the University of California
1994, Sun Microsystems, Inc.
License: ecshash
Files: ogdi/c-api/ecsregex.c
Copyright: 1986, University of Toronto
License: OGDI-TORONTO
Files: ogdi/c-api/opendir.c
ogdi/c-api/opendir.h
ogdi/glutil/dirent.c
......@@ -102,21 +95,6 @@ License: OGDI-QUEEN
representations about the suitability of this software for any purpose.
It is provided "as is" without express or implied warranty.
License: OGDI-TORONTO
Permission is granted to anyone to use this software for any
purpose on any computer system, and to redistribute it freely,
subject to the following restrictions:
.
1. The author is not responsible for the consequences of use of
this software, no matter how awful, even if they arise
from defects in it.
.
2. The origin of this software must not be misrepresented, either
by explicit claim or by omission.
.
3. Altered versions must be plainly marked as such, and must not
be misrepresented as being the original software.
License: MIT
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
......@@ -170,40 +148,6 @@ License: LGPL-2.1+
On Debian systems, the full text of the GNU Lesser General Public
License can be found in `/usr/share/common-licenses/LGPL-2.1'.
License: ecshash
This software is copyrighted by the Regents of the University of
California, Sun Microsystems, Inc., and other parties. The following
terms apply to all files associated with the software unless explicitly
disclaimed in individual files.
.
The authors hereby grant permission to use, copy, modify, distribute,
and license this software and its documentation for any purpose, provided
that existing copyright notices are retained in all copies and that this
notice is included verbatim in any distributions. No written agreement,
license, or royalty fee is required for any of the authorized uses.
Modifications to this software may be copyrighted by their authors
and need not follow the licensing terms described here, provided that
the new terms are clearly indicated on the first page of each file where
they apply.
.
IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
.
THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
MODIFICATIONS.
.
RESTRICTED RIGHTS: Use, duplication or disclosure by the government
is subject to the restrictions as set forth in subparagraph (c) (1) (ii)
of the Rights in Technical Data and Computer Software Clause as DFARS
252.227-7013 and FAR 52.227-19.
License: VPFLIB
The vpflib library contains the public domain VPFVIEW C code included
with the Digital Chart of the World, Edition 1, which was pruned and ported
......
debian/libogdi4.0.symbols → debian/libogdi4.1.symbols
View file @ c08762e9
libogdi.so.4.0 #PACKAGE# #MINVER#
* Build-Depends-Package: libogdi4.0-dev
EcsGetRegError@Base 3.2.0~beta2
EcsRegComp@Base 3.2.0~beta2
EcsRegError@Base 3.2.0~beta2
EcsRegExec@Base 3.2.0~beta2
libogdi.so.4.1 #PACKAGE# #MINVER#
* Build-Depends-Package: libogdi-dev
cln_AllocClient@Base 3.2.0~beta2
cln_BlockOGDI@Base 3.2.0~beta2
cln_BroadCloseLayers@Base 3.2.0~beta2
......@@ -84,15 +80,12 @@ libogdi.so.4.0 #PACKAGE# #MINVER#
ecs_DefReadALine@Base 3.2.0~beta2
ecs_DefReadFile@Base 3.2.0~beta2
ecs_DefReadIndex@Base 3.2.0~beta2
ecs_DeleteHashEntry@Base 3.2.0~beta2
ecs_DeleteHashTable@Base 3.2.0~beta2
ecs_DistanceMBR@Base 3.2.0~beta2
ecs_DistanceObject@Base 3.2.0~beta2
ecs_DistanceObjectWithTolerance@Base 3.2.0~beta2
ecs_DistanceSegment@Base 3.2.0~beta2
ecs_ExtractRequestInformation@Base 3.2.0~beta2
ecs_FindElement@Base 3.2.0~beta2
ecs_FirstHashEntry@Base 3.2.0~beta2
ecs_FreeLayer@Base 3.2.0~beta2
ecs_FreeObject@Base 3.2.0~beta2
ecs_GetDefaultInfo@Base 3.2.0~beta2
......@@ -101,13 +94,9 @@ libogdi.so.4.0 #PACKAGE# #MINVER#
ecs_GetLayer@Base 3.2.0~beta2
ecs_GetPixelFromRGB@Base 3.2.0~beta2
ecs_GetRGBFromPixel@Base 3.2.0~beta2
ecs_GetRegex@Base 3.2.0~beta2
ecs_GetTileId@Base 3.2.0~beta2
ecs_GetTileIdFromPos@Base 3.2.0~beta2
ecs_HashStats@Base 3.2.0~beta2
ecs_InitHashTable@Base 3.2.0~beta2
ecs_IsPointInPolygon@Base 3.2.0~beta2
ecs_NextHashEntry@Base 3.2.0~beta2
ecs_OpenDynamicLib@Base 3.2.0~beta2
ecs_ParseCapabilities@Base 3.2.0~beta2
ecs_Q@Base 3.2.0~beta2
......@@ -225,7 +214,7 @@ libogdi.so.4.0 #PACKAGE# #MINVER#
xdr_ecs_Text@Base 3.2.0~beta2
xdr_ecs_TopoLevel@Base 3.2.0~beta2
xdr_ecs_Transformation@Base 3.2.0~beta2
libvpf.so.4.0 #PACKAGE# #MINVER#
libvpf.so.4.1 #PACKAGE# #MINVER#
Ccmpval@Base 3.2.0~beta2
Dcmpval@Base 3.2.0~beta2
Fcmpval@Base 3.2.0~beta2
......
debian/patches/shared
View file @ c08762e9
......@@ -55,8 +55,8 @@ Author: Francesco Paolo Lovergine <frankie@debian.org>
-TARGETGEN=$(DYNAGEN)
-endif
SOURCES = ecs_dyna.c ecsregex.c ecssplit.c \
ecsassoc.c ecshash.c ecstile.c server.c ecsdist.c \
SOURCES = ecs_dyna.c ecssplit.c \
ecsassoc.c ecstile.c server.c ecsdist.c \
--- a/vpflib/makefile
+++ b/vpflib/makefile
@@ -7,7 +7,7 @@
......
include/win32/compat/dirent.h deleted 100644 → 0
View file @ 6738361e
/*
* @(#) dirent.h 2.0 17 Jun 91 Public Domain.
*
* A public domain implementation of BSD directory routines for
* MS-DOS. Written by Michael Rendell ({uunet,utai}michael@garfield),
* August 1987
*
* Enhanced and ported to OS/2 by Kai Uwe Rommel; added scandir() prototype
* December 1989, February 1990
* Change of MAXPATHLEN for HPFS, October 1990
*
* Unenhanced and ported to Windows NT by Bill Gallagher
* 17 Jun 91
* changed d_name to char * instead of array, removed non-std extensions
*
* Cleanup, other hackery, Summer '92, Brian Moran , brianmo@microsoft.com
*/
#ifndef _DIRENT
#define _DIRENT
#ifndef _WINDOWS
#include <sys/dir.h>
#define dirent direct
#else
#include <direct.h>
struct dirent
{
ino_t d_ino; /* a bit of a farce */
short d_reclen; /* more farce */
short d_namlen; /* length of d_name */
char *d_name;
};
struct _dircontents
{
char *_d_entry;
struct _dircontents *_d_next;
};
typedef struct _dirdesc
{
int dd_id; /* uniquely identify each open directory*/
long dd_loc; /* where we are in directory entry */
struct _dircontents *dd_contents; /* pointer to contents of dir */
struct _dircontents *dd_cp; /* pointer to current position */
}
DIR;
extern DIR *opendir(char *);
extern struct dirent *readdir(DIR *);
extern void seekdir(DIR *, long);
extern long telldir(DIR *);
extern void closedir(DIR *);
#define rewinddir(dirp) seekdir(dirp, 0L)
#endif /* _WINDOWS */
#endif /* _DIRENT */
/* end of dirent.h */
include/win32/compat/dirent2.h deleted 100644 → 0
View file @ 6738361e
/*
* dirent.h --
*
* Declarations of a library of directory-reading procedures
* in the POSIX style ("struct dirent").
*
* Copyright (c) 1991 The Regents of the University of California.
* Copyright (c) 1994 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
* @(#) dirent2.h 1.3 94/12/17 16:26:16
*/
#ifndef _DIRENT
#define _DIRENT
#ifndef _TCL
#include <tcl.h>
#endif
/*
* Dirent structure, which holds information about a single
* directory entry.
*/
#define MAXNAMLEN 255
#define DIRBLKSIZ 512
struct dirent {
long d_ino; /* Inode number of entry */
short d_reclen; /* Length of this record */
short d_namlen; /* Length of string in d_name */
char d_name[MAXNAMLEN + 1]; /* Name must be no longer than this */
};
/*
* State that keeps track of the reading of a directory (clients
* should never look inside this structure; the fields should
* only be accessed by the library procedures).
*/
typedef struct _dirdesc {
int dd_fd;
long dd_loc;
long dd_size;
char dd_buf[DIRBLKSIZ];
} DIR;
/*
* Procedures defined for reading directories:
*/
extern void closedir _ANSI_ARGS_((DIR *dirp));
extern DIR * opendir _ANSI_ARGS_((char *name));
extern struct dirent * readdir _ANSI_ARGS_((DIR *dirp));
#endif /* _DIRENT */
include/win32/compat/fixstrtod.c deleted 100644 → 0
View file @ 6738361e
/*
* fixstrtod.c --
*
* Source code for the "fixstrtod" procedure. This procedure is
* used in place of strtod under Solaris 2.4, in order to fix
* a bug where the "end" pointer gets set incorrectly.
*
* Copyright (c) 1995 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
static char sccsid[] = "@(#) fixstrtod.c 1.1 95/05/06 17:40:33";
#undef strtod
#include <stdlib.h>
double
fixstrtod(string, endPtr)
char *string;
char **endPtr;
{
double d;
d = strtod(string, endPtr);
if ((*endPtr != string) && ((*endPtr)[-1] == 0)) {
*endPtr -= 1;
}
return d;
}
include/win32/compat/float.h deleted 100644 → 0
View file @ 6738361e
/*
* float.h --
*
* This is a dummy header file to #include in Tcl when there
* is no float.h in /usr/include. Right now this file is empty:
* Tcl contains #ifdefs to deal with the lack of definitions;
* all it needs is for the #include statement to work.
*
* Copyright (c) 1993 The Regents of the University of California.
* Copyright (c) 1994 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
* @(#) float.h 1.2 94/12/17 16:26:17
*/
include/win32/compat/getcwd.c deleted 100644 → 0
View file @ 6738361e
/*
* getcwd.c --
*
* This file provides an implementation of the getcwd procedure
* that uses getwd, for systems with getwd but without getcwd.
*
* Copyright (c) 1993 The Regents of the University of California.
* Copyright (c) 1994 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
#ifndef lint
static char sccsid[] = "@(#) getcwd.c 1.4 94/12/17 16:26:18";
#endif /* not lint */
#include "tclInt.h"
#include "tclPort.h"
extern char *getwd _ANSI_ARGS_((char *pathname));
char *
getcwd(buf, size)
char *buf; /* Where to put path for current directory. */
size_t size; /* Number of bytes at buf. */
{
char realBuffer[MAXPATHLEN+1];
int length;
if (getwd(realBuffer) == NULL) {
/*
* There's not much we can do besides guess at an errno to
* use for the result (the error message in realBuffer isn't
* much use...).
*/
errno = EACCES;
return NULL;
}
length = strlen(realBuffer);
if (length >= size) {
errno = ERANGE;
return NULL;
}
strcpy(buf, realBuffer);
return buf;
}
include/win32/compat/license.terms deleted 100644 → 0
View file @ 6738361e
This software is copyrighted by the Regents of the University of
California, Sun Microsystems, Inc., and other parties. The following
terms apply to all files associated with the software unless explicitly
disclaimed in individual files.
The authors hereby grant permission to use, copy, modify, distribute,
and license this software and its documentation for any purpose, provided
that existing copyright notices are retained in all copies and that this
notice is included verbatim in any distributions. No written agreement,
license, or royalty fee is required for any of the authorized uses.
Modifications to this software may be copyrighted by their authors
and need not follow the licensing terms described here, provided that
the new terms are clearly indicated on the first page of each file where
they apply.
IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
MODIFICATIONS.
RESTRICTED RIGHTS: Use, duplication or disclosure by the government
is subject to the restrictions as set forth in subparagraph (c) (1) (ii)
of the Rights in Technical Data and Computer Software Clause as DFARS
252.227-7013 and FAR 52.227-19.
include/win32/compat/limits.h deleted 100644 → 0
View file @ 6738361e
/*
* limits.h --
*
* This is a dummy header file to #include in Tcl when there
* is no limits.h in /usr/include. There are only a few
* definitions here; also see tclPort.h, which already
* #defines some of the things here if they're not arleady
* defined.
*
* Copyright (c) 1991 The Regents of the University of California.
* Copyright (c) 1994 Sun Microsystems, Inc.
*
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
* @(#) limits.h 1.6 94/12/17 16:26:19
*/
#define LONG_MIN 0x80000000
#define LONG_MAX 0x7fffffff
#define INT_MIN 0x80000000
#define INT_MAX 0x7fffffff