Skip to content
Commits on Source (24)
Expand all Show whitespace changes
Inline Side-by-side
CITATION
View file @ fd134a48
To cite PROJ in publications use:
PROJ contributors (2018). PROJ coordinate transformation software
library. Open Source Geospatial Foundation. URL http://proj4.org/.
library. Open Source Geospatial Foundation. URL https://proj4.org/.
A BibTeX entry for LaTeX users is
......@@ -10,5 +10,5 @@ A BibTeX entry for LaTeX users is
author = {{PROJ contributors}},
organization = {Open Source Geospatial Foundation},
year = {2018},
url = {http://proj4.org/},
url = {https://proj4.org/},
}
CMakeLists.txt
View file @ fd134a48
......@@ -12,7 +12,7 @@
cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
# For historic reasons, the CMake PROJECT-NAME is PROJ4
project(PROJ4 C)
project(PROJ4 LANGUAGES C CXX)
set(PROJECT_INTERN_NAME PROJ)
if (NOT CMAKE_VERSION VERSION_LESS 3.1)
......@@ -23,11 +23,15 @@ endif ()
if("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
# Suppress warning 4706 about assignment within conditional expression
# Suppress warning 4996 about sprintf, etc., being unsafe
# Suppress warning 4589 about Constructor of abstract class...ignores initializer for virtual base class (see https://github.com/weidai11/cryptopp/issues/214#issuecomment-230283061)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /wd4706 /wd4996 /D_CRT_SECURE_NO_WARNINGS")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /W4 /wd4706 /wd4996 /wd4589 /D_CRT_SECURE_NO_WARNINGS")
elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wswitch -Wshadow -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Wformat-security")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wswitch -Wshadow -Wunused-parameter -Wmissing-declarations -Wformat -Wformat-security")
elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wswitch -Wshadow -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Wformat-security -Wfloat-conversion -Wc99-extensions -Wc11-extensions")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wswitch -Wshadow -Wunused-parameter -Wmissing-declarations -Wformat -Wformat-security -Wfloat-conversion")
endif()
# Tell Intel compiler to do arithmetic accurately. This is needed to
......@@ -37,8 +41,10 @@ endif()
if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
if (MSVC)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:precise")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qstd=c++11")
else ()
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fp-model precise")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif ()
endif ()
......@@ -57,9 +63,9 @@ colormsg(_HIBLUE_ "Configuring PROJ:")
#PROJ version information
#################################################################################
include(ProjVersion)
proj_version(MAJOR 5 MINOR 0 PATCH 0)
proj_version(MAJOR 5 MINOR 2 PATCH 0)
set(PROJ_API_VERSION "14")
set(PROJ_BUILD_VERSION "14.0.1")
set(PROJ_BUILD_VERSION "14.0.2")
#################################################################################
# Build features and variants
......@@ -124,7 +130,6 @@ endif ()
option(PROJ_TESTS "Enable build of collection of PROJ tests" ON)
boost_report_value(PROJ_TESTS)
if(PROJ_TESTS)
include(CTest)
enable_testing()
endif(PROJ_TESTS)
include(ProjTest)
......
Makefile.in
View file @ fd134a48
# Makefile.in generated by automake 1.13.4 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -79,19 +89,18 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/proj.pc.in COPYING config.guess config.sub depcomp \
install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_warn_all.m4 \
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
......@@ -161,7 +170,7 @@ am__recursive_targets = \
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir dist dist-all distcheck
cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
......@@ -183,6 +192,9 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/proj.pc.in AUTHORS \
COPYING ChangeLog INSTALL NEWS README compile config.guess \
config.sub depcomp install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -238,6 +250,11 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXX_WFLAGS = @CXX_WFLAGS@
CYGPATH_W = @CYGPATH_W@
C_WFLAGS = @C_WFLAGS@
DEFS = @DEFS@
......@@ -252,6 +269,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
HAVE_CXX11 = @HAVE_CXX11@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
......@@ -266,12 +284,14 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MUTEX_SETTING = @MUTEX_SETTING@
NM = @NM@
NMEDIT = @NMEDIT@
NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG = @NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
......@@ -297,6 +317,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
......@@ -367,15 +388,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
......@@ -525,7 +545,10 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
......@@ -590,7 +613,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
......@@ -606,11 +629,17 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
......@@ -627,7 +656,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
......@@ -637,22 +666,23 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
mkdir $(distdir)/_build $(distdir)/_inst
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
&& $(am__cd) $(distdir)/_build/sub \
&& ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
......@@ -832,6 +862,8 @@ uninstall-am: uninstall-pkgconfigDATA
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-pkgconfigDATA
.PRECIOUS: Makefile
README: README.md
fgrep -v "[![" $< > $@
......
NEWS
View file @ fd134a48
5.2.0 Release Notes
-------------------
UPDATES
-------
o Added support for deg, rad and grad in unitconvert (#1054)
o Assume +t_epoch as time input when not otherwise specified (#1065)
o Added inverse Lagrange projection (#1058)
o Added +multiplier option to vgridshift (#1072)
o Added Equal Earth projection (#1085)
o Added "require_grid" option to gie (#1088)
o Replace +transpose option of Helmert transform with +convention.
From now on the convention used should be explicitly written. An
error will be returned when using the +transpose option (#1091)
o Improved numerical precision of inverse spherical Mercator
projection (#1105)
o cct will now forward text after coordinate input to output
stream (#1111)
BUG FIXES
------------
o Do not pivot over WGS84 when doing cs2cs-emulation with geocent (#1026)
o Do not scan past the end of the read data in pj_ctx_fgets (#1042)
o Make sure proj_errno_string() is available in DLL (#1050)
o Respect +to_meter setting when doing cs2cs-emulation (#1053)
o Fixed unit conversion factors for geod (#1075)
o Fixed test failures related to GCC 8 (#1084)
o Improved handling of +geoc flag (#1093)
o Calculate correct projection factors for Webmercator (#1095)
o cs2cs now always outputs degrees when transformed coordinates are
in angular units (#1112)
All bug fix numbers refer to issues or pull requests indexed at
https://github.com/OSGeo/proj.4/
THANKS TO
------------
Version 5.2.0 is made possible by the following contributors:
Søren Holm
Mateusz Łoskot
Jürnjakob Dugge
Greg Minshall
Aaron Puchert
Vedran Stojnović
Bojan Šavrič
Charles Karney
Mateusz Loskot
Howard Butler
Mike Toews
Kurt Schwehr
Even Rouault
Kristian Evers
5.1.0 Release Notes
-------------------
......
README
View file @ fd134a48
......@@ -7,7 +7,7 @@ This includes cartographic projections as well as geodetic transformations.
For more information on the PROJ.4 project please see the web page at:
http://proj4.org/
https://proj4.org/
The PROJ.4 mailing list can be found at:
......
aclocal.m4
View file @ fd134a48
This diff is collapsed.
cmake/Makefile.in
View file @ fd134a48
# Makefile.in generated by automake 1.13.4 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -78,15 +88,17 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = cmake
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cflags_warn_all.m4 \
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/proj_config.h
CONFIG_CLEAN_FILES =
......@@ -111,6 +123,7 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
......@@ -125,6 +138,11 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXX_WFLAGS = @CXX_WFLAGS@
CYGPATH_W = @CYGPATH_W@
C_WFLAGS = @C_WFLAGS@
DEFS = @DEFS@
......@@ -139,6 +157,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
HAVE_CXX11 = @HAVE_CXX11@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
......@@ -153,12 +172,14 @@ LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MUTEX_SETTING = @MUTEX_SETTING@
NM = @NM@
NMEDIT = @NMEDIT@
NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG = @NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
......@@ -184,6 +205,7 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
......@@ -259,14 +281,13 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cmake/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu cmake/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
......@@ -290,7 +311,10 @@ ctags CTAGS:
cscope cscopelist:
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
......@@ -434,6 +458,8 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags-am uninstall uninstall-am
.PRECIOUS: Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
cmake/ProjConfig.cmake
View file @ fd134a48
......@@ -5,7 +5,7 @@
#
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
# https://www.boost.org/LICENSE_1_0.txt)
################################################################################
include (CheckIncludeFiles)
include (CheckLibraryExists)
......@@ -34,7 +34,7 @@ set(PACKAGE_BUGREPORT "https://github.com/OSGeo/proj.4/issues")
set(PACKAGE_NAME "PROJ")
set(PACKAGE_STRING "PROJ ${${PROJECT_INTERN_NAME}_VERSION}")
set(PACKAGE_TARNAME "proj")
set(PACKAGE_URL "http://proj4.org")
set(PACKAGE_URL "https://proj4.org")
set(PACKAGE_VERSION "${${PROJECT_INTERN_NAME}_VERSION}")
configure_file(cmake/proj_config.cmake.in src/proj_config.h)
......
cmake/ProjSystemInfo.cmake
View file @ fd134a48
......@@ -7,7 +7,7 @@
#
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
# https://www.boost.org/LICENSE_1_0.txt)
################################################################################
# The following variables are defined:
# PROJ_COMPILER_NAME - name of compiler toolset, follows Boost toolset naming.
......
cmake/ProjUtilities.cmake
View file @ fd134a48
......@@ -9,7 +9,7 @@
#
# Distributed under the Boost Software License, Version 1.0.
# See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt
# https://www.boost.org/LICENSE_1_0.txt
################################################################################
# Macros in this module:
#
......@@ -355,7 +355,7 @@ endmacro()
#
# Scans the current directory and returns a list of subdirectories.
# Author: Robert Fleming
# Source: http://www.cmake.org/pipermail/cmake/2008-February/020114.html
# Source: https://www.cmake.org/pipermail/cmake/2008-February/020114.html
#
# Third parameter is 1 if you want relative paths returned.
# Usage: list_subdirectories(the_list_is_returned_here /path/to/project TRUE)
......
compile 0 → 100755
View file @ fd134a48
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2018-03-07.03; # UTC
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# 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
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# 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, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
nl='
'
# We need space, tab and new line, in precisely that order. Quoting is
# there to prevent tools from complaining about whitespace usage.
IFS=" "" $nl"
file_conv=
# func_file_conv build_file lazy
# Convert a $build file to $host form and store it in $file
# Currently only supports Windows hosts. If the determined conversion
# type is listed in (the comma separated) LAZY, no conversion will
# take place.
func_file_conv ()
{
file=$1
case $file in
/ | /[!/]*) # absolute file, and not a UNC file
if test -z "$file_conv"; then
# lazily determine how to convert abs files
case `uname -s` in
MINGW*)
file_conv=mingw
;;
CYGWIN*)
file_conv=cygwin
;;
*)
file_conv=wine
;;
esac
fi
case $file_conv/,$2, in
*,$file_conv,*)
;;
mingw/*)
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
;;
cygwin/*)
file=`cygpath -m "$file" || echo "$file"`
;;
wine/*)
file=`winepath -w "$file" || echo "$file"`
;;
esac
;;
esac
}
# func_cl_dashL linkdir
# Make cl look for libraries in LINKDIR
func_cl_dashL ()
{
func_file_conv "$1"
if test -z "$lib_path"; then
lib_path=$file
else
lib_path="$lib_path;$file"
fi
linker_opts="$linker_opts -LIBPATH:$file"
}
# func_cl_dashl library
# Do a library search-path lookup for cl
func_cl_dashl ()
{
lib=$1
found=no
save_IFS=$IFS
IFS=';'
for dir in $lib_path $LIB
do
IFS=$save_IFS
if $shared && test -f "$dir/$lib.dll.lib"; then
found=yes
lib=$dir/$lib.dll.lib
break
fi
if test -f "$dir/$lib.lib"; then
found=yes
lib=$dir/$lib.lib
break
fi
if test -f "$dir/lib$lib.a"; then
found=yes
lib=$dir/lib$lib.a
break
fi
done
IFS=$save_IFS
if test "$found" != yes; then
lib=$lib.lib
fi
}
# func_cl_wrapper cl arg...
# Adjust compile command to suit cl
func_cl_wrapper ()
{
# Assume a capable shell
lib_path=
shared=:
linker_opts=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as 'compile cc -o foo foo.c'.
eat=1
case $2 in
*.o | *.[oO][bB][jJ])
func_file_conv "$2"
set x "$@" -Fo"$file"
shift
;;
*)
func_file_conv "$2"
set x "$@" -Fe"$file"
shift
;;
esac
;;
-I)
eat=1
func_file_conv "$2" mingw
set x "$@" -I"$file"
shift
;;
-I*)
func_file_conv "${1#-I}" mingw
set x "$@" -I"$file"
shift
;;
-l)
eat=1
func_cl_dashl "$2"
set x "$@" "$lib"
shift
;;
-l*)
func_cl_dashl "${1#-l}"
set x "$@" "$lib"
shift
;;
-L)
eat=1
func_cl_dashL "$2"
;;
-L*)
func_cl_dashL "${1#-L}"
;;
-static)
shared=false
;;
-Wl,*)
arg=${1#-Wl,}
save_ifs="$IFS"; IFS=','
for flag in $arg; do
IFS="$save_ifs"
linker_opts="$linker_opts $flag"
done
IFS="$save_ifs"
;;
-Xlinker)
eat=1
linker_opts="$linker_opts $2"
;;
-*)
set x "$@" "$1"
shift
;;
*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
func_file_conv "$1"
set x "$@" -Tp"$file"
shift
;;
*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
func_file_conv "$1" mingw
set x "$@" "$file"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -n "$linker_opts"; then
linker_opts="-link$linker_opts"
fi
exec "$@" $linker_opts
exit 1
}
eat=
case $1 in
'')
echo "$0: No command. Try '$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS]
Wrapper for compilers which do not understand '-c -o'.
Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected.
If you are trying to build a whole package this is not the
right script to run: please start by reading the file 'INSTALL'.
Report bugs to <bug-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
ofile=
cfile=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as 'compile cc -o foo foo.c'.
# So we strip '-o arg' only if arg is an object.
eat=1
case $2 in
*.o | *.obj)
ofile=$2
;;
*)
set x "$@" -o "$2"
shift
;;
esac
;;
*.c)
cfile=$1
set x "$@" "$1"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -z "$ofile" || test -z "$cfile"; then
# If no '-o' option was seen then we might have been invoked from a
# pattern rule where we don't need one. That is ok -- this is a
# normal compilation that the losing compiler can handle. If no
# '.c' file was seen then we are probably linking. That is also
# ok.
exec "$@"
fi
# Name of file we expect compiler to create.
cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
# Create the lock directory.
# Note: use '[/\\:.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
while true; do
if mkdir "$lockdir" >/dev/null 2>&1; then
break
fi
sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
"$@"
ret=$?
if test -f "$cofile"; then
test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
config.guess
View file @ fd134a48
This diff is collapsed.
config.sub
View file @ fd134a48
This diff is collapsed.
configure
View file @ fd134a48
This diff is collapsed.
configure.ac
View file @ fd134a48
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT([PROJ], [5.1.0],
[https://github.com/OSGeo/proj.4/issues], proj, [http://proj4.org])
AC_INIT([PROJ], [5.2.0],
[https://github.com/OSGeo/proj.4/issues], proj, [https://proj4.org])
AC_CONFIG_MACRO_DIR([m4])
AC_LANG(C)
......@@ -10,17 +10,139 @@ AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(src/proj_config.h)
dnl Enable as much warnings as possible
AX_CFLAGS_WARN_ALL(C_WFLAGS)
AC_SUBST(C_WFLAGS,$C_WFLAGS)
dnl Checks for programs.
AC_PROG_CC
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AM_PROG_LIBTOOL
dnl Enable as much warnings as possible
AX_CFLAGS_WARN_ALL(C_WFLAGS)
AX_CXXFLAGS_WARN_ALL(CXX_WFLAGS)
dnl For ICC: it needs -we10006 instead of -Werror to turn unknown options to errors
dnl Some gcc/clang versions might succeed on this test, so also include -Werror in ERROR_ON_UNKNOWN_OPTIONS
AX_CHECK_COMPILE_FLAG([-Werror -we10006],[ERROR_ON_UNKNOWN_OPTIONS="-Werror -we10006"],[ERROR_ON_UNKNOWN_OPTIONS="-Werror"])
dnl A few ICC warnings to turn off
dnl warning #188: enumerated type mixed with another type (needed on libcsf)
dnl warning #1684: conversion from pointer to same-sized integral type (potential portability problem) (needed on frmts/mrf)
dnl warning #2259: non-pointer conversion from "size_t={unsigned long}" to "int" may lose significant bits
dnl warning #2304: non-explicit constructor with single argument may cause implicit type conversion
dnl warning #3280: declaration hides member
dnl remark #11074: Inlining inhibited by limit max-size
dnl remark #11076: To get full report use -qopt-report=4 -qopt-report-phase ipo
AX_CHECK_COMPILE_FLAG([-diag-disable 188,1684,2259,2304,3280,11074,11076],[C_WFLAGS="$C_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076" CXX_WFLAGS="$CXX_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Wextra],[C_WFLAGS="$C_WFLAGS -Wextra" CXX_WFLAGS="$CXX_WFLAGS -Wextra"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Winit-self],[C_WFLAGS="$C_WFLAGS -Winit-self" CXX_WFLAGS="$CXX_WFLAGS -Winit-self"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Wunused-parameter], [C_WFLAGS="$C_WFLAGS -Wunused-parameter" CXX_WFLAGS="$CXX_WFLAGS -Wunused-parameter" NO_UNUSED_PARAMETER_FLAG="-Wno-unused-parameter"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Wmissing-prototypes], [C_WFLAGS="$C_WFLAGS -Wmissing-prototypes"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Wmissing-declarations], [C_WFLAGS="$C_WFLAGS -Wmissing-declarations"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Wformat], [C_WFLAGS="$C_WFLAGS -Wformat" CXX_WFLAGS="$CXX_WFLAGS -Wformat"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Wformat -Werror=format-security -Wno-format-nonliteral], [C_WFLAGS="$C_WFLAGS -Werror=format-security -Wno-format-nonliteral" CXX_WFLAGS="$CXX_WFLAGS -Werror=format-security -Wno-format-nonliteral"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Wshorten-64-to-32], [C_WFLAGS="$C_WFLAGS -Wshorten-64-to-32" CXX_WFLAGS="$CXX_WFLAGS -Wshorten-64-to-32"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Wlogical-op], [C_WFLAGS="$C_WFLAGS -Wlogical-op" CXX_WFLAGS="$CXX_WFLAGS -Wlogical-op" NO_LOGICAL_OP_FLAG="-Wno-logical-op"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Wshadow], [C_WFLAGS="$C_WFLAGS -Wshadow" CXX_WFLAGS="$CXX_WFLAGS -Wshadow"],,[$ERROR_ON_UNKNOWN_OPTIONS])
dnl Error out on things that will fail with MSVC
AX_CHECK_COMPILE_FLAG([-Werror=vla], [C_WFLAGS="$C_WFLAGS -Werror=vla" CXX_WFLAGS="$CXX_WFLAGS -Werror=vla"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Werror=declaration-after-statement], [C_WFLAGS="$C_WFLAGS -Wdeclaration-after-statement"],,[$ERROR_ON_UNKNOWN_OPTIONS])
dnl -Wclobbered is not reliable on most gcc versions
dnl AX_CHECK_COMPILE_FLAG([-Wno-clobbered], [C_WFLAGS="$C_WFLAGS -Wno-clobbered" CXX_WFLAGS="$CXX_WFLAGS -Wno-clobbered"],,[$ERROR_ON_UNKNOWN_OPTIONS])
dnl Warn when macros __TIME__, __DATE__ or __TIMESTAMP__ are encountered as they might prevent bit-wise-identical reproducible compilations.
AX_CHECK_COMPILE_FLAG([-Wdate-time], [C_WFLAGS="$C_WFLAGS -Wdate-time" CXX_WFLAGS="$CXX_WFLAGS -Wdate-time"],,[$ERROR_ON_UNKNOWN_OPTIONS])
dnl GCC 6 warnings
AX_CHECK_COMPILE_FLAG([-Wnull-dereference], [C_WFLAGS="$C_WFLAGS -Wnull-dereference" CXX_WFLAGS="$CXX_WFLAGS -Wnull-dereference"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Wduplicated-cond], [C_WFLAGS="$C_WFLAGS -Wduplicated-cond" CXX_WFLAGS="$CXX_WFLAGS -Wduplicated-cond"],,[$ERROR_ON_UNKNOWN_OPTIONS])
dnl GCC 7 warnings
dnl Do not enable yet. Causes warning in alg/gdalthinplate.cpp due to armadillo templates
dnl AX_CHECK_COMPILE_FLAG([-Wduplicated-branches], [C_WFLAGS="$C_WFLAGS -Wduplicated-branches" CXX_WFLAGS="$CXX_WFLAGS -Wduplicated-branches"],,[$ERROR_ON_UNKNOWN_OPTIONS])
dnl GCC 8 warnings
AC_LANG_PUSH([C++])
AX_CHECK_COMPILE_FLAG([-Wextra-semi], [CXX_WFLAGS="$CXX_WFLAGS -Wextra-semi"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AC_LANG_POP([C++])
AX_CHECK_COMPILE_FLAG([-Wno-sign-compare], [NO_SIGN_COMPARE="-Wno-sign-compare"],,[$ERROR_ON_UNKNOWN_OPTIONS])
dnl clang >= 3.9
AX_CHECK_COMPILE_FLAG([-Wcomma], [C_WFLAGS="$C_WFLAGS -Wcomma" CXX_WFLAGS="$CXX_WFLAGS -Wcomma"],,[$ERROR_ON_UNKNOWN_OPTIONS])
dnl clang and gcc 5
AX_CHECK_COMPILE_FLAG([-Wfloat-conversion], [C_WFLAGS="$C_WFLAGS -Wfloat-conversion" CXX_WFLAGS="$CXX_WFLAGS -Wfloat-conversion"],,[$ERROR_ON_UNKNOWN_OPTIONS])
dnl clang >= 3.2
AX_CHECK_COMPILE_FLAG([-Wdocumentation -Wno-documentation-deprecated-sync], [C_WFLAGS="$C_WFLAGS -Wdocumentation -Wno-documentation-deprecated-sync" CXX_WFLAGS="$CXX_WFLAGS -Wdocumentation -Wno-documentation-deprecated-sync"],,[$ERROR_ON_UNKNOWN_OPTIONS])
dnl gnu89 is a reasonable target to get MSVC compatibility.
dnl but only apply it with gcc, since clang will throw a lot of warnings
SAVED_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $ERROR_ON_UNKNOWN_OPTIONS -std=gnu89"
AC_MSG_CHECKING([if -std=gnu89 can be enabled])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[[#if defined(__clang__) || !defined(__GNUC__)
#error "not gcc"
#endif]])],
[C_WFLAGS="$C_WFLAGS -std=gnu89"]
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])])
CFLAGS=$SAVED_CFLAGS
dnl C++ specific stuff
AC_LANG_PUSH([C++])
AX_CHECK_COMPILE_FLAG([-Wunused-private-field], [CXX_WFLAGS="$CXX_WFLAGS -Wunused-private-field"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Wmissing-prototypes], [CXX_WFLAGS="$CXX_WFLAGS -Wmissing-prototypes"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Wmissing-declarations], [CXX_WFLAGS="$CXX_WFLAGS -Wmissing-declarations"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Wnon-virtual-dtor], [CXX_WFLAGS="$CXX_WFLAGS -Wnon-virtual-dtor" NO_NON_VIRTUAL_DTOR_FLAG="-Wno-non-virtual-dtor"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Wold-style-cast], [WARN_OLD_STYLE_CAST="-Wold-style-cast"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Weffc++], [WARN_EFFCPLUSPLUS="-Weffc++"],,[$ERROR_ON_UNKNOWN_OPTIONS])
dnl g++-4.8 complain a bit too much with -Weffc++
if test "$WARN_EFFCPLUSPLUS" != ""; then
SAVED_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $WARN_EFFCPLUSPLUS -Werror"
AC_MSG_CHECKING([if -Weffc++ should be enabled])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[[
class Base {};
class A: public Base {};
]])],
[AC_MSG_RESULT([yes])],
[WARN_EFFCPLUSPLUS=""]
[AC_MSG_RESULT([no])])
CXXFLAGS="$SAVED_CXXFLAGS"
CXX_WFLAGS="$CXX_WFLAGS $WARN_EFFCPLUSPLUS"
fi
dnl Clang enables -Woverloaded-virtual if -Wall is defined, but not GCC
AX_CHECK_COMPILE_FLAG([-Woverloaded-virtual], [CXX_WFLAGS="$CXX_WFLAGS -Woverloaded-virtual"],,[$ERROR_ON_UNKNOWN_OPTIONS])
dnl Forbid use of 'or', 'and', ... alias operators
AX_CHECK_COMPILE_FLAG([-fno-operator-names], [CXX_WFLAGS="$CXX_WFLAGS -fno-operator-names"],,[$ERROR_ON_UNKNOWN_OPTIONS])
HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT=no
AX_CHECK_COMPILE_FLAG([-Wzero-as-null-pointer-constant], [CXX_WFLAGS="$CXX_WFLAGS -Wzero-as-null-pointer-constant" HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT=yes NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG="-Wno-zero-as-null-pointer-constant"],,[$ERROR_ON_UNKNOWN_OPTIONS])
if test "$HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT" = "yes"; then
AC_DEFINE_UNQUOTED(HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT, 1,
[Define to 1 if the compiler supports -Wzero-as-null-pointer-constant])
fi
AC_LANG_POP([C++])
AC_SUBST(C_WFLAGS,$C_WFLAGS)
AC_SUBST(CXX_WFLAGS,$CXX_WFLAGS)
AC_SUBST(NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG,$NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG)
dnl Checks for libraries.
save_CFLAGS="$CFLAGS"
CFLAGS=`echo "$CFLAGS" | sed "s/-Werror/ /"`
......@@ -142,7 +264,12 @@ AC_SUBST(MUTEX_SETTING,$MUTEX_SETTING)
AC_SUBST(THREAD_LIB,$THREAD_LIB)
AC_CONFIG_FILES([Makefile cmake/Makefile src/Makefile
test/Makefile test/gie/Makefile test/gigs/Makefile
test/Makefile test/gie/Makefile test/gigs/Makefile test/unit/Makefile
test/googletest/Makefile test/googletest/include/Makefile
test/googletest/include/gtest/Makefile
test/googletest/include/gtest/internal/Makefile
test/googletest/include/gtest/internal/custom/Makefile
test/googletest/src/Makefile
man/Makefile man/man1/Makefile man/man3/Makefile nad/Makefile
jniwrap/Makefile jniwrap/org.osgeo.proj/Makefile jniwrap/org.osgeo.proj/org/Makefile jniwrap/org.osgeo.proj/org/proj4/Makefile])
AC_CONFIG_FILES([nad/install], [chmod +x nad/install])
......
debian/changelog
View file @ fd134a48
proj (5.1.0-3) UNRELEASED; urgency=medium
proj (5.2.0-1) unstable; urgency=medium
* New upstream release.
* Move from experimental to unstable.
-- Bas Couwenberg <sebastic@debian.org> Sat, 15 Sep 2018 18:15:48 +0200
proj (5.2.0~rc2-1~exp1) experimental; urgency=medium
* New upstream release candidate.
* Drop patches, applied upstream.
-- Bas Couwenberg <sebastic@debian.org> Thu, 13 Sep 2018 07:22:54 +0200
proj (5.2.0~rc1-1~exp1) experimental; urgency=medium
* New upstream release candidate.
* Bump Standards-Version to 4.2.1, no changes.
* Update Homepage URL to use HTTPS.
* Add license & copyright for gtest sources.
* Drop patches, included upstream.
* Update datumgrids.shar (XZ compressed) with proj-datumgrid-1.8RC1.
* Add patch to fix SONAME decrement.
* Update symbols for 5.2.0~rc1.
* Add patch to not install gtest libraries.
* Add patch to not install test executables.
-- Bas Couwenberg <sebastic@debian.org> Tue, 28 Aug 2018 15:14:59 +0200
-- Bas Couwenberg <sebastic@debian.org> Tue, 11 Sep 2018 09:23:37 +0200
proj (5.1.0-2) unstable; urgency=medium
......
debian/control
View file @ fd134a48
......@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9),
Standards-Version: 4.2.1
Vcs-Browser: https://salsa.debian.org/debian-gis-team/proj
Vcs-Git: https://salsa.debian.org/debian-gis-team/proj.git
Homepage: http://proj4.org/
Homepage: https://proj4.org/
Package: proj-data
Architecture: all
......
debian/copyright
View file @ fd134a48
......@@ -38,6 +38,7 @@ Copyright: 2016-2018, Kristian Evers
2012-2018, Charles Karney <charles@karney.com>
2011-2018, Open Geospatial Consortium, Inc
2008-2012, 2018, Even Rouault <even dot rouault at mines-paris dot org>
2018, Google Inc.
2017, Lukasz Komsta
2016, Karsten Engsager
2015, Drazen Tutic
......@@ -52,10 +53,6 @@ Copyright: 2016-2018, Kristian Evers
2001, Thomas Flemming <tf@ttqv.com>
License: Expat
Files: ltmain.sh
Copyright: 1996-2015, Free Software Foundation, Inc.
License: GPL-2+ with Libtool exception
Files: src/proj_etmerc.c
Comment: The code in this file is largly based upon procedures:
.
......@@ -100,6 +97,10 @@ License: public-domain
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
Files: test/googletest/*
Copyright: 2003, 2005-2009, 2015, Google Inc.
License: BSD-3-Clause
Files: debian/*
Copyright: 1999-2005, Peter S Galbraith <psg@debian.org>
2007-2009, 2012-2013, Francesco Paolo Lovergine <frankie@debian.org>
......@@ -113,6 +114,33 @@ License: public-domain
All those data are public domain, taken and collected from various
US/Canada, France, Switzerland and New Zealand public domain resources.
License: BSD-3-Clause
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.
.
3) Neither the name of the ORGANIZATION nor the names of its contributors may
be used to endorse or promote products derived from this software without
specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
......@@ -132,32 +160,6 @@ License: Expat
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
License: GPL-2+ with Libtool exception
GNU Libtool is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
.
As a special exception to the GNU General Public License,
if you distribute this file as part of a program or library that
is built using GNU Libtool, you may include this file under the
same distribution terms that you use for the rest of that program.
.
GNU Libtool is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
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 GNU Libtool; see the file COPYING. If not, a copy
can be downloaded from http://www.gnu.org/licenses/gpl.html,
or obtained by writing to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
License: GPL-2+
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
......
debian/datumgrids.shar
View file @ fd134a48
......@@ -3,9 +3,9 @@
# To extract the files from this archive, save it to some FILE, remove
# everything before the '#!/bin/sh' line above, then type 'sh FILE'.
#
lock_dir=_sh06205
# Made on 2018-02-26 22:21 CET by <bas@anubis>.
# Source directory was '/tmp/proj-datumgrid-1.7RC2'.
lock_dir=_sh25295
# Made on 2018-09-11 08:15 CEST by <bas@anubis>.
# Source directory was '/tmp/proj-datumgrid-1.8RC1'.
#
# Existing files will *not* be overwritten, unless '-c' is specified.
#
......@@ -24,7 +24,7 @@ lock_dir=_sh06205
# 232 -rw-r--r-- null
# 318464 -rw-r--r-- nzgd2kgrid0005.gsb
# 26728 -rw-r--r-- prvi
# 4618 -rw-r--r-- README.DATUMGRID
# 4645 -rw-r--r-- README.DATUMGRID
# 59208 -rw-r--r-- stgeorge
# 26728 -rw-r--r-- stlrnc
# 7048 -rw-r--r-- stpaul
......@@ -135,7 +135,7 @@ ${echo} "x - SKIPPING alaska (file already exists)"
else
${echo} "x - extracting alaska xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X6C9[_Y=`"&5!"1JQ/]?:'X26*X.
MX[[].39(@6>$9M$UU"#1I;:%/!,<RTR*(4U(JW"C(W(ES]'T%IQD@K,\9:!Q
M,D]5^\3]*J(U9M73F;'!E"6J19LGK<Y7:!Y@JHSD@7S;46R?Q`^=;%LN`NO>
......@@ -15246,7 +15246,7 @@ SHAR_EOF
${echo} xz-decompressing file alaska &&
 
xz -dc ${lock_dir}/xzi > 'alaska' && \
(set 20 18 02 26 21 53 48 'alaska'
(set 20 18 09 10 20 16 06 'alaska'
eval "${shar_touch}") && \
chmod 0644 'alaska'
if test $? -ne 0
......@@ -15272,7 +15272,7 @@ ${echo} "x - SKIPPING BETA2007.gsb (file already exists)"
else
${echo} "x - extracting BETA2007.gsb xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X4;O;KI=`"<51;ZK4D7::">S[$,*
M#?V+\2IH*'1;@<->E]ZS^X,UT\==C*NLL"&!NRFQ+N<Q`IVO4.NV3,?*6),8
M?K\3O%:A!6WCG^KE3X-\T=<M4!%K`A.0CU,*O9$YD7B14&(0:6C?Q);PIA_/
......@@ -15937,7 +15937,7 @@ ${echo} "x - SKIPPING conus (file already exists)"
else
${echo} "x - extracting conus xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X3I<[_Y=`"&5!"1JQ/]?:'X26*X.
MX_S4E90@,\UPTK!_5%(3YLM!3-ZSSKG#3.8)-@179P9,I]-Y\!0<7(@Q8=7%
MX/+E'OZ]D5XQ?`TIT<VRROMD>IQ-$1RG%$P8JPK7);85R=R9#I`/[VPW+BZJ
......@@ -20709,7 +20709,7 @@ SHAR_EOF
${echo} xz-decompressing file conus &&
 
xz -dc ${lock_dir}/xzi > 'conus' && \
(set 20 18 02 26 21 53 48 'conus'
(set 20 18 09 10 20 16 06 'conus'
eval "${shar_touch}") && \
chmod 0644 'conus'
if test $? -ne 0
......@@ -20735,7 +20735,7 @@ ${echo} "x - SKIPPING egm96_15.gtx (file already exists)"
else
${echo} "x - extracting egm96_15.gtx xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X=?O[_]=`&`5C``-/,)\;PB;O;0H
MLG<XK\L,]-B4B]\&G&BA%@+RHSO$<KQ9P7TVMX%ICBIQ.(BQNT43L43>A52W
MZD,0Y%N'<]3?$90\;J;`[3Y2X.`U(4W]<<#<R/P(=_P2T&U6/1M`NS(7(K#$
......@@ -84696,7 +84696,7 @@ ${echo} "x - SKIPPING FL (file already exists)"
else
${echo} "x - extracting FL xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X"*G'5]=`"&5!"1JQ/]?:'X26*X.
MY%D7L`=5Y9&5;JT9I6ILFU`D-"=H]C0;+9&]_M0`;[@96IJ[7+V'#^9:49DY
M3L<>H$Y3:S[TL`G%(2>3<1,.XZ;=F2%PZW`;>&:)_0@Q3<?.5:[;<8QKY.).
......@@ -84872,7 +84872,7 @@ SHAR_EOF
${echo} xz-decompressing file FL &&
 
xz -dc ${lock_dir}/xzi > 'FL' && \
(set 20 18 02 26 21 53 48 'FL'
(set 20 18 09 10 20 16 06 'FL'
eval "${shar_touch}") && \
chmod 0644 'FL'
if test $? -ne 0
......@@ -84898,7 +84898,7 @@ ${echo} "x - SKIPPING hawaii (file already exists)"
else
${echo} "x - extracting hawaii xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X:%@[_Y=`"&5!"1JQ/]?:'X26*X.
MY)8!48:G259R#Z3]B#O$$V@(JJR">==7--A-YIMB&O67&&$HV?Y."(,4]L&C
M>5C/GESO47R4PCD,<]SHHFPU<]^"6<1;%A#H#GEERFN<H6KU=J-P^]9:T.>9
......@@ -90705,7 +90705,7 @@ SHAR_EOF
${echo} xz-decompressing file hawaii &&
 
xz -dc ${lock_dir}/xzi > 'hawaii' && \
(set 20 18 02 26 21 53 48 'hawaii'
(set 20 18 09 10 20 16 06 'hawaii'
eval "${shar_touch}") && \
chmod 0644 'hawaii'
if test $? -ne 0
......@@ -90731,7 +90731,7 @@ ${echo} "x - SKIPPING MD (file already exists)"
else
${echo} "x - extracting MD xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X`WG#$1=`"&5!"1JQ/]?:'X26*X.
MY3`=:X_!?<W%Y(%><`B1C*6S^JC\'#L8*H4$RPIV>(Y+;3*9%:\4101HA9$4
M?O-QK0)WLYGAM%=GHLPPJFP?&<L8R-1^?I<>3\;UH_3^H7U5IP'2=RT<K*]/
......@@ -90810,7 +90810,7 @@ SHAR_EOF
${echo} xz-decompressing file MD &&
 
xz -dc ${lock_dir}/xzi > 'MD' && \
(set 20 18 02 26 21 53 48 'MD'
(set 20 18 09 10 20 16 06 'MD'
eval "${shar_touch}") && \
chmod 0644 'MD'
if test $? -ne 0
......@@ -90836,7 +90836,7 @@ ${echo} "x - SKIPPING ntf_r93.gsb (file already exists)"
else
${echo} "x - extracting ntf_r93.gsb xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,XDG0[_Y=`"<51;ZK4D7::">S[$,*
M#?V+\2IH*'1;@<->E]ZS^X,UT\==C*NLL"&!NRFQ+L3XL.5XWGVKZTWW67F9
M`\:)RN/-P`%XNS.I]&BD^O="?18-(1?+A>SM;[#>;KQ6][O'EW;/J??3?%N.
......@@ -93295,7 +93295,7 @@ ${echo} "x - SKIPPING ntv1_can.dat (file already exists)"
else
${echo} "x - extracting ntv1_can.dat xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,XCWP[_Y=`"011"<-!;^.BWE+7`;`
M]Z<X5P/,HAS=JW<>VV6=R/.7$`0_.-,2*@(1F:H1:Q?)[;STWSW#251_U.8^
M.*4GD?R:I*I79GM%3U!/L9ZKU@$T&0#E7^"M^(_"%8&V3,/+"KO<'8+Y0JDM
......@@ -101778,7 +101778,7 @@ ${echo} "x - SKIPPING null (file already exists)"
else
${echo} "x - extracting null xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X`#G`$M=`"&5!"1JQ/]?:'X26*X.
MY5!#..CKP;CHM7Q-DCSI/G:R0CKUN2G[/!VCJX0JW=U6S1BF7B_F1G`?6:H#
M?/7/_GD6/*ON5"N'POH`````[T(NX;JPS)T``6?H`0```$0`O':QQ&?[`@``
......@@ -101789,7 +101789,7 @@ SHAR_EOF
${echo} xz-decompressing file null &&
 
xz -dc ${lock_dir}/xzi > 'null' && \
(set 20 18 02 26 21 53 48 'null'
(set 20 18 09 10 20 16 06 'null'
eval "${shar_touch}") && \
chmod 0644 'null'
if test $? -ne 0
......@@ -101815,7 +101815,7 @@ ${echo} "x - SKIPPING nzgd2kgrid0005.gsb (file already exists)"
else
${echo} "x - extracting nzgd2kgrid0005.gsb xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X3V>[_Y=`"<51;ZK4D7::">S[$,*
M#?V+\2IH*'1;@<->E]ZS^X,UT\==C*NLL"&!NRFQ+N=LDXRG;]ND(GS*<2$+
MEM7XO6TYFJXR&8/`G\#_ON18*=CR`_=-</,PC`)YPVD$?Z^^.T)6<+4_OGJ'
......@@ -106930,7 +106930,7 @@ ${echo} "x - SKIPPING prvi (file already exists)"
else
${echo} "x - extracting prvi xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X&AG.JY=`"&5!"1JQ/]?:'X26*X.
MY8YR`@"KUP+'5P,2F8[QM<<!04LK3.P+&@(BGSMPU:,ZZV%_""<A'T>'G6O<
MOW1TW`@0BMSNK79/DA`&#A1QCL(#%ZL\,Z"UHUL&V-O&2'K,E"%[TU).3O--
......@@ -107273,7 +107273,7 @@ SHAR_EOF
${echo} xz-decompressing file prvi &&
 
xz -dc ${lock_dir}/xzi > 'prvi' && \
(set 20 18 02 26 21 53 48 'prvi'
(set 20 18 09 10 20 16 06 'prvi'
eval "${shar_touch}") && \
chmod 0644 'prvi'
if test $? -ne 0
......@@ -107299,8 +107299,8 @@ ${echo} "x - SKIPPING README.DATUMGRID (file already exists)"
else
${echo} "x - extracting README.DATUMGRID xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X!()!\-=`!&(!H:A2Y\.F5F,_7/L
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X!(D!]!=`!&(!H:A2Y\.F5F,_7/L
M:3H]">XZ$#'GBS@73<RG6=^9*8>_FT6D`\(IU&KWYDUJ@&6>G>J\*19)5=9#
M]_B$0"@L<<,DZQ!@`PKQS"PD<6<L8'^1CQ'XLM)]^4PX$`GBN7MB.]4%DK+9
M%#BD+:["*78D.BD'.,2P\H5R+S1X%,,,)*4-I];&]61*R,F_JZD)!">Y7O[^
......@@ -107340,19 +107340,19 @@ MEK64IUS)JOER%7U^,>^'46-$8L,-#,7YD!.#&T'%H,[4!@ZJ&%0^DV9@742@
MC"/)W<4QW[FH\PH$VE;>:$!!?;YZ'O6\JO?L#FGI[*.8D(19+UY\3]Y?UR%>
M8U^1`"[U+E*;;S5VA7O/^:[9`!2!P(AT90S&A!QO0='1:._1YN#2\:C$8\9:
M'72<OTJY8IV=YJC%Z?J)4[RXLZ-\*C`G^^(;=$"$`->^F=']93(/YZ;S('%`
MR$PPBT-UM_YU0JZ..Y9C`B'0.T8=.!\LU>YC]".F/*@FD,\T]/GU--EK[I+=
M(UE'DKQY.Z-F90XXF9#\X#U\NE%NCAUDN61\I,)?M88_"UMGL('9^\T*A7VY
MKNEI:4B>XC@5$XRBEOF@FCN9^[G%XJ83XR4QLHMKX,0T:`6NA`[@A/YC>`M;
MH(:>7CWIHVL[&MLG_"O8G=Q:<U3S+%*PMYZZ!4D4FG;""_7P>:OD?J21:+BG
M1J,57J@>DJ.XVK\,BWZA_LS5[4K<2<X2HO@IILQ=MINEP>7<[U,``(\&!6/Q
;\$H(``'?#XHD``"55<T?L<1G^P(`````!%E:
MR$PPBT-UM_YU0JZ..Y9C`B'0.T8=.!\LU>YC]".F/*@FD,\T]/GU--E+HA67
M+PY<"/P\A]K:,E>>7TP]1LO*-5EEXC/GX\$I?!YVA]]"<7F;Z&H]H%[I+A.Z
MG?^!!$*D(.B/=:3<(K&TT*Y9,WP?%=$\T`CBP.P"TDR\#:V[9"U]<ARAB;*,
M.E)WS`ZPAXWI,=%$]<#JPIK'<%3+PK3JZE&/JQU52-3UKCY43V%SB.Z25H[Y
M06!O._CAJ(OF%C:.>#\.B'#,N<C#)D445\:ODQ;P$I<4$'=55.^(VR&,X+58
GQVQ4#SJ,`#L*,%A;G/'-``'L#Z4D``#^GW)EL<1G^P(`````!%E:
`
end
SHAR_EOF
${echo} xz-decompressing file README.DATUMGRID &&
 
xz -dc ${lock_dir}/xzi > 'README.DATUMGRID' && \
(set 20 18 02 26 21 53 28 'README.DATUMGRID'
(set 20 18 09 10 20 13 39 'README.DATUMGRID'
eval "${shar_touch}") && \
chmod 0644 'README.DATUMGRID'
if test $? -ne 0
......@@ -107362,12 +107362,12 @@ fi
then (
${MD5SUM} -c >/dev/null 2>&1 || ${echo} 'README.DATUMGRID': 'MD5 check failed'
) << \SHAR_EOF
a947be6b510e96a57966a39ead4e6226 README.DATUMGRID
64afcf68b8fbd8597cf444885f4e3e98 README.DATUMGRID
SHAR_EOF
 
else
test `LC_ALL=C wc -c < 'README.DATUMGRID'` -ne 4618 && \
${echo} "restoration warning: size of 'README.DATUMGRID' is not 4618"
test `LC_ALL=C wc -c < 'README.DATUMGRID'` -ne 4645 && \
${echo} "restoration warning: size of 'README.DATUMGRID' is not 4645"
fi
fi
# ============= stgeorge ==============
......@@ -107378,7 +107378,7 @@ ${echo} "x - SKIPPING stgeorge (file already exists)"
else
${echo} "x - extracting stgeorge xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X.='?9-=`"&5!"1JQ/]?:'X26*X.
MY?"Q"G;S']+;SJW!2[OSH=R#6(C3QK`UC<&H<88_V;-2N3%8H*6'!4%L9S?4
MC<6)LRN;'PE$`+M.G_O2YQPD0.HE65TU":D"X**':OHL<=#QK&J*^.96]&BI
......@@ -108101,7 +108101,7 @@ SHAR_EOF
${echo} xz-decompressing file stgeorge &&
 
xz -dc ${lock_dir}/xzi > 'stgeorge' && \
(set 20 18 02 26 21 53 48 'stgeorge'
(set 20 18 09 10 20 16 06 'stgeorge'
eval "${shar_touch}") && \
chmod 0644 'stgeorge'
if test $? -ne 0
......@@ -108127,7 +108127,7 @@ ${echo} "x - SKIPPING stlrnc (file already exists)"
else
${echo} "x - extracting stlrnc xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X&AG/"]=`"&5!"1JQ/]?:'X26*X.
MY?"Q"G<&Y3[LV`&=?$$WYIJT,X2L(=;*8MV`2NG`89XM[*9;K)K,)R8TO^<'
MS_^-A.C0H%9TL([]>.%VTV78<B,71Y5U"R(N91]"1XT_?0.8['@MY6X"U"0F
......@@ -108478,7 +108478,7 @@ SHAR_EOF
${echo} xz-decompressing file stlrnc &&
 
xz -dc ${lock_dir}/xzi > 'stlrnc' && \
(set 20 18 02 26 21 53 48 'stlrnc'
(set 20 18 09 10 20 16 06 'stlrnc'
eval "${shar_touch}") && \
chmod 0644 'stlrnc'
if test $? -ne 0
......@@ -108504,7 +108504,7 @@ ${echo} "x - SKIPPING stpaul (file already exists)"
else
${echo} "x - extracting stpaul xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X!N'$=Q=`"&5!"1JQ/]?:'X26*X.
MY?"Q"G<6Z-;:C'ZCLS9&KY*D"9;=?#0QV)V<PF^M:6`#?F]9<C-?BYXF*W12
M!2_3:I+`;#`#>9ZB#02:KUOP@L;6_&0J?S.U?!F2IV*<<0/*0$>F9EF&V1L?
......@@ -108615,7 +108615,7 @@ SHAR_EOF
${echo} xz-decompressing file stpaul &&
 
xz -dc ${lock_dir}/xzi > 'stpaul' && \
(set 20 18 02 26 21 53 48 'stpaul'
(set 20 18 09 10 20 16 06 'stpaul'
eval "${shar_touch}") && \
chmod 0644 'stpaul'
if test $? -ne 0
......@@ -108641,7 +108641,7 @@ ${echo} "x - SKIPPING TN (file already exists)"
else
${echo} "x - extracting TN xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X!%'#KI=`"&5!"1JQ/]?:'X26*X.
MYA"JA\?E^^_Y1[N]'D0BEO)E/&B+-JZ\MG3B[#])R\`Z)Z\*%[^;-^,'8Q^B
MQQTO8=D2"'E7_WU,LU?V2P5':FM`,:F/ES)LDJUJ\/<>)`DJ7GMXJ&_0%MC"
......@@ -108734,7 +108734,7 @@ SHAR_EOF
${echo} xz-decompressing file TN &&
 
xz -dc ${lock_dir}/xzi > 'TN' && \
(set 20 18 02 26 21 53 48 'TN'
(set 20 18 09 10 20 16 06 'TN'
eval "${shar_touch}") && \
chmod 0644 'TN'
if test $? -ne 0
......@@ -108760,7 +108760,7 @@ ${echo} "x - SKIPPING WI (file already exists)"
else
${echo} "x - extracting WI xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X!IG%L1=`"&5!"1JQ/]?:'X26*X.
MYGGO:J^KND!\HL<Z))Y2"#9+G?O)/#5]%XQ4"CA]G>$T1OL,U0&WE7-BO(AB
M/2L7=4J#YOU5INSMOF`K8&Y%=)]YLK$)B:`Y^WA'W"SP8QT4MOD'N['7?*LO
......@@ -108898,7 +108898,7 @@ SHAR_EOF
${echo} xz-decompressing file WI &&
 
xz -dc ${lock_dir}/xzi > 'WI' && \
(set 20 18 02 26 21 53 48 'WI'
(set 20 18 09 10 20 16 06 'WI'
eval "${shar_touch}") && \
chmod 0644 'WI'
if test $? -ne 0
......@@ -108924,7 +108924,7 @@ ${echo} "x - SKIPPING WO (file already exists)"
else
${echo} "x - extracting WO xz-compressed"
sed 's/^X//' << 'SHAR_EOF' | uudecode &&
begin 600 _sh06205/xzi
begin 600 _sh25295/xzi
M_3=Z6%H```3FUK1&`@`A`1P````0SUC,X"MG)@E=`"&5!"1JQ/]?:'X26*X.
MYGE5TBZ:TCX&`UZ=V0HU$^7!O.%1)Q(>*6\PR``KS&U76]6,FR#C_5!,&TJY
M2RQVREC?=2)!Z5\.,'^5.,/__25H'$)]R`-[\KR@B#)M@8IB'T1<2KM*#`H/
......@@ -109149,7 +109149,7 @@ SHAR_EOF
${echo} xz-decompressing file WO &&
 
xz -dc ${lock_dir}/xzi > 'WO' && \
(set 20 18 02 26 21 53 48 'WO'
(set 20 18 09 10 20 16 06 'WO'
eval "${shar_touch}") && \
chmod 0644 'WO'
if test $? -ne 0
debian/libproj13.symbols
View file @ fd134a48
......@@ -144,6 +144,7 @@ libproj.so.13 #PACKAGE# #MINVER#
pj_enfn@Base 4.8.0
pj_eqc@Base 4.8.0
pj_eqdc@Base 4.8.0
pj_eqearth@Base 5.2.0~rc1
pj_erase_ellipsoid_def@Base 5.0.0
pj_errno@Base 4.8.0
pj_etmerc@Base 4.8.0
......@@ -316,6 +317,7 @@ libproj.so.13 #PACKAGE# #MINVER#
pj_projection_specific_setup_eck6@Base 4.9.3
pj_projection_specific_setup_eqc@Base 4.9.3
pj_projection_specific_setup_eqdc@Base 4.9.3
pj_projection_specific_setup_eqearth@Base 5.2.0~rc1
pj_projection_specific_setup_etmerc@Base 4.9.3
pj_projection_specific_setup_euler@Base 4.9.3
pj_projection_specific_setup_fahey@Base 4.9.3
......@@ -490,6 +492,7 @@ libproj.so.13 #PACKAGE# #MINVER#
pj_s_eck6@Base 4.8.0
pj_s_eqc@Base 4.8.0
pj_s_eqdc@Base 4.8.0
pj_s_eqearth@Base 5.2.0~rc1
pj_s_etmerc@Base 4.8.0
pj_s_euler@Base 4.8.0
pj_s_fahey@Base 4.8.0
......