Commit 88c0052d authored by Markus Wanner's avatar Markus Wanner

Import upstream version 2.1.0rc1

parent 83ec1be7
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
......@@ -16,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
......@@ -56,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
......@@ -111,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
......@@ -169,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
......@@ -226,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
......@@ -256,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
......@@ -278,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
......@@ -292,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -304,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
......@@ -337,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
For updated credits, see the PostGIS manual.
Offline: see doc/README
Online: http://www.postgis.org/documentation/manual-svn/postgis_introduction.html#credits
Online: http://postgis.net/docs/manual-dev/postgis_introduction.html#credits
This diff is collapsed.
This diff is collapsed.
PostGIS - Geographic Information Systems Extensions to PostgreSQL
=================================================================
:Version: 2.0.3
:Date: 2013-03-01
:Version: 2.1.0
:Date: 2013-07-DD
:Website: http://postgis.net
This distribution contains a module which implements GIS simple features, ties
......@@ -34,7 +34,7 @@ Directory structure::
REQUIREMENTS
------------
PostGIS is compatible with PostgreSQL 8.4 and above.
PostGIS is compatible with PostgreSQL 9.0 and above.
You *must* have the full PostgreSQL - including server headers - installed for
this to work.
......@@ -46,12 +46,12 @@ this to work.
http://trac.osgeo.org/proj/
* GEOS (Required, Version 3.2.2 or higher):
* GEOS (Required, Version 3.3.0 or higher
- 3.4+ is strongly recommended and needed for full features):
The GEOS library provides support for exact topological tests such as
ST_Touches(), ST_Contains(), ST_Disjoint() and spatial operations such as
ST_Intersection(), ST_Union() and ST_Buffer(). GEOS 3.3.2 or higher is
recommended.
ST_Intersection(), ST_Union() and ST_Buffer(). GEOS 3.4+ is recommended.
http://trac.osgeo.org/geos/
......@@ -65,9 +65,10 @@ this to work.
* GNU gettext
The loader, and hence PostGIS, requires GNU gettext 0.14 or higher
for translation support
(typically in libc on GNU/Linux, in which case 0.17 is required).
* JSON-C (Required, Version 0.9 or higher)
* JSON-C (Optional, Version 0.9 or higher)
JSON-C is used to import GeoJSON via the function ST_GeomFromGeoJson().
......@@ -77,11 +78,15 @@ this to work.
apt-get install libjson0-dev
* GDAL (Optional, Version 1.6.0 or higher)
* GDAL (Optional, Version 1.8.0 or higher 1.9+ is strongly recommended) needed for raster support
Also needed to install PostGIS using CREATE EXTENSION postgis; syntax
GDAL (http://gdal.org) is *required* if you want to compile PostGIS
with raster support. To compile without raster support you
must ``./configure --without-raster``
* CGAL 4.1+ and SFCGAL (Optional) needed for advanced 3D support
https://github.com/Oslandia/SFCGAL
CONFIGURATION
......@@ -118,6 +123,9 @@ If you want to compile PostGIS *without* Raster support, you must provide the
If you want to compile PostGIS *without* Topology support, you must provide the
``--without-topology`` option.
PostGIS will be compiled with sfcgal support if it is found. You can explicitly
state the location with --with-sfcgal=path/to/sfcgal
See ``./configure --help`` for more options.
......
......@@ -4,6 +4,6 @@
# See HOWTO_RELEASE file in SVN for definitions of those three.
POSTGIS_MAJOR_VERSION=2
POSTGIS_MINOR_VERSION=0
POSTGIS_MICRO_VERSION=3
POSTGIS_MINOR_VERSION=1
POSTGIS_MICRO_VERSION=0rc1
# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
# Inc.
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -12,15 +11,12 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
# Inc.
# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 1
# AM_PROG_MKDIR_P
# ---------------
# Check for `mkdir -p'.
......
benjubb = Ben Jubb <benjubb@refractions.net>
chodgson = Chris Hodgson <chodgson@refractions.net>
colivier = Olivier Courtin <olivier.courtin@camptocamp.com>
cvs = No Body <no@body.net>
dblasby = David Blasby <dblasby@gmail.com>
devrim = Devrim GÜNDÜZ <devrim@gunduz.org>
dustymugs = Bborie Park <bkpark at ucdavis.edu>
dzwarg = David Zwarg <dzwarg@azavea.com>
jeffloun = Jeff Lounsbury <jeffloun@refractions.net>
jorgearevalo = Jorge Arévalo <jorge.arevalo at deimos-space.com>
kneufeld = Kevin Neufeld <kneufeld.ca@gmail.com>
mcayland = Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
mleslie = Mark Leslie <mark.leslie@lisasoft.com>
mloskot = Mateusz Loskot <mateusz@loskot.net>
mschaber = Markus Schaber <markus@schabi.de>
nbarker = Norman Barker <nbarker@ittvis.com>
nicklas = Nicklas Avén <nicklas.aven@jordogskog.no>
pracine = Pierre Racine <Pierre.Racine@sbf.ulaval.ca>
pramsey = Paul Ramsey <pramsey@cleverelephant.ca>
rmason = Ralph Mason <ralph.mason@telogis.com>
robe = Regina Obe <lr@pcorp.us>
snowman = Stephen Frost <sfrost@snowman.net>
strk = Sandro Santilli <strk@keybit.net>
warmerdam = Frank Warmerdam <warmerdam@pobox.com>
xingkth = Xing Lin <solo.lin@gmail.com>
yecarrillo = Eduin Carrillo <yecarrillo@yahoo.com>
strk:Sandro Santilli <strk@keybit.net>
pramsey:Paul Ramsey <pramsey@cleverelephant.ca>
warmerdam:Frank Warmerdam <warmerdam@pobox.com>
mloskot:Mateusz Loskot <mateusz@loskot.net>
robe:Regina Obe <lr@pcorp.us>
mcayland:Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
benjubb:Ben Jubb <benjubb@refractions.net>
chodgson:Chris Hodgson <chodgson@refractions.net>
colivier:Olivier Courtin <olivier.courtin@camptocamp.com>
cvs:No Body <no@body.net>
dblasby:David Blasby <dblasby@gmail.com>
devrim:Devrim GÜNDÜZ <devrim@gunduz.org>
dustymugs:Bborie Park <bkpark at ucdavis.edu>
dzwarg:David Zwarg <dzwarg@azavea.com>
jeffloun:Jeff Lounsbury <jeffloun@refractions.net>
jorgearevalo:Jorge Arévalo <jorge.arevalo at deimos-space.com>
kneufeld:Kevin Neufeld <kneufeld.ca@gmail.com>
chodgson:Chris Hodgson <chodgson@refractions.net>
mcayland:Mark Cave-Ayland <mark.cave-ayland@siriusit.co.uk>
mleslie:Mark Leslie <mark.leslie@lisasoft.com>
mloskot:Mateusz Loskot <mateusz@loskot.net>
mschaber:Markus Schaber <markus@schabi.de>
nbarker:Norman Barker <nbarker@ittvis.com>
nicklas:Nicklas Avén <nicklas.aven@jordogskog.no>
pracine:Pierre Racine <Pierre.Racine@sbf.ulaval.ca>
jorgearevalo:Jorge Arévalo <jorge.arevalo at deimos-space.com>
dustymugs:Bborie Park <bkpark at ucdavis.edu>
dzwarg:David Zwarg <dzwarg@azavea.com>
pramsey:Paul Ramsey <pramsey@cleverelephant.ca>
rmason:Ralph Mason <ralph.mason@telogis.com>
robe:Regina Obe <lr@pcorp.us>
snowman:Stephen Frost <sfrost@snowman.net>
strk:Sandro Santilli <strk@keybit.net>
warmerdam:Frank Warmerdam <warmerdam@pobox.com>
xingkth:Xing Lin <solo.lin@gmail.com>
yecarrillo:Eduin Carrillo <yecarrillo@yahoo.com>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
#
# PostGIS - Spatial Types for PostgreSQL
# http://www.postgis.net
#
# This is free software; you can redistribute and/or modify it under
# the terms of the GNU General Public Licence. See the COPYING file.
#
# PostGIS documentation build Makefile
#
# Written by Mark Cave-Ayland
# Copyright 2003-2012 Sandro Santilli <strk@keybit.net>
# Copyright 2004-2012 Paul Ramsey <pramsey@cleverelephant.ca>
# Copyright 2009-2011 Regina Obe <lr@pcorp.us>
# Copyright 2008-2010 Mark Cave-Ayland
# Copyright 2008-2010 Kevin Neufeld <kneufeld.ca@gmail.com>
# Copyright 2009-2010 Olivier Courtin <olivier.courtin@camptocamp.com>
# Copyright 2005-2006 Markus Schaber <markus@schabi.de>
#
# NOTE: We don't use a standard PGXS Makefile here since the DOCS target
# only allows files to be stored within contrib/ and we currently
......@@ -9,9 +21,11 @@
# that we could produce a large number of files (think chunked HTML)
#
translations = it_IT pt_BR
POSTGIS_MAJOR_VERSION=2
POSTGIS_MINOR_VERSION=0
POSTGIS_MICRO_VERSION=3
POSTGIS_MINOR_VERSION=1
POSTGIS_MICRO_VERSION=0rc1
INSTALL=/usr/bin/install -c
INSTALL_DATA=${INSTALL} -m 644
......@@ -19,6 +33,7 @@ INSTALL_DATA=${INSTALL} -m 644
XSLTPROC=/usr/bin/xsltproc
XSLBASE=/usr/share/xml/docbook/stylesheet/nwalsh
XMLLINT=/usr/bin/xmllint
PERL=/usr/bin/perl
# To allow network access use:
#
......@@ -32,7 +47,7 @@ XSLTPROC_COMMONOPTS= \
--param section.autolabel 1 \
--param section.label.includes.component.label 1 \
--param chunk.section.depth 0 \
--param generate.section.toc.level 1 \
--param generate.section.toc.level 2 \
--param funcsynopsis.style kr \
--param admon.graphics 1 \
--param admon.textlabel 0 \
......@@ -53,10 +68,19 @@ DBLATEX=/usr/bin/dblatex
# Imagemagick's convert utility program for generated images used in the documentation
IMAGEMAGICK=/usr/bin/convert
# Gettext for translated documentation
MSGMERGE=msgmerge
# XML gettext tools
XML2POT=xml2pot
# DOCBOOK to EPUB
DBTOEPUB=dbtoepub
# Directories for postgresql subdirectories
PGSQL_DOCDIR=/usr/share/doc/postgresql-doc-9.1
PGSQL_MANDIR=/usr/share/postgresql/9.1/man
PGSQL_SHAREDIR=/usr/share/postgresql/9.1
PGSQL_DOCDIR=/var/lib/jenkins/workspace/pg/rel/pg9.2w64/share/doc/postgresql
PGSQL_MANDIR=/var/lib/jenkins/workspace/pg/rel/pg9.2w64/share/man
PGSQL_SHAREDIR=/var/lib/jenkins/workspace/pg/rel/pg9.2w64/share/postgresql
# If XSLTPROC or XSLBASE were not found during configure, we cannot
# build the documentation
......@@ -74,7 +98,7 @@ endif
endif
endif
XML_INPUTS = \