This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libgeotiff-dfsg.
commit 7760b1f8af84429085cefe07de1c165c4f436aec Author: Bas Couwenberg <[email protected]> Date: Thu Aug 18 21:13:18 2016 +0200 Imported Upstream version 1.4.2~rc4 --- ChangeLog | 12 +++++++++++- Makefile.am | 2 +- Makefile.in | 40 ++++++++++++++++++++++++++++++++-------- cpl_serv.c | 7 ------- cpl_serv.h | 4 ++-- geo_config.h | 22 ---------------------- geo_config.h.vc | 5 ----- geotiff.h | 2 +- 8 files changed, 47 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6946b01..ea98f66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,14 @@ -2016-08-16 Even Rouault <even dot rouault at spatialys dot com> +2016-08-18 Even Rouault <even dot rouault at spatialys dot com> + + * Makefile.am: Fix build issue on Windows with cmake by not + including generate geo_config.h in the dist .zip/.tar.gz + * geotiff.h cpl_serv.h: change #include "geo_config.h" to #include <geo_config.h> + * cpl_serv.h: do not include <strings.h> on _WIN32 even if HAVE_STRINGS_H is defined + * cpl_config.h.vc: remove #define HAVE_STRINGS_H 1 + * cpl_serv.c: remove includes of string.h and strings.h. Already done by cpl_serv.h + * Prepare for 1.4.2RC4 + +2016-08-17 Even Rouault <even dot rouault at spatialys dot com> * Prepare for 1.4.2RC3 diff --git a/Makefile.am b/Makefile.am index 805bd81..ea67fb8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,6 @@ dist_csv_DATA = csv/alias.csv \ csv/vertcs.override.csv include_HEADERS = geotiff.h \ - geo_config.h \ geotiffio.h \ geovalues.h \ geonames.h \ @@ -82,6 +81,7 @@ include_HEADERS = geotiff.h \ geokeys.inc \ geo_incode_defs.h +nodist_include_HEADERS = geo_config.h libgeotiff_la_SOURCES = cpl_serv.c \ cpl_csv.c \ diff --git a/Makefile.in b/Makefile.in index 6f4323c..8c8bd29 100644 --- a/Makefile.in +++ b/Makefile.in @@ -168,7 +168,7 @@ am__uninstall_files_from_dir = { \ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(csvdir)" \ - "$(DESTDIR)$(includedir)" + "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) libgeotiff_la_DEPENDENCIES = libxtiff/libxtiff.la am__libgeotiff_la_SOURCES_DIST = cpl_serv.c cpl_csv.c geo_extra.c \ @@ -245,7 +245,7 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(dist_csv_DATA) -HEADERS = $(include_HEADERS) +HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -541,7 +541,6 @@ dist_csv_DATA = csv/alias.csv \ csv/vertcs.override.csv include_HEADERS = geotiff.h \ - geo_config.h \ geotiffio.h \ geovalues.h \ geonames.h \ @@ -563,6 +562,7 @@ include_HEADERS = geotiff.h \ geokeys.inc \ geo_incode_defs.h +nodist_include_HEADERS = geo_config.h libgeotiff_la_SOURCES = cpl_serv.c cpl_csv.c geo_extra.c geo_free.c \ geo_get.c geo_names.c geo_new.c geo_normalize.c geo_print.c \ geo_set.c geo_simpletags.c geo_tiffp.c geo_trans.c geo_write.c \ @@ -804,6 +804,27 @@ uninstall-includeHEADERS: @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +install-nodist_includeHEADERS: $(nodist_include_HEADERS) + @$(NORMAL_INSTALL) + @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ + $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ + done + +uninstall-nodist_includeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. @@ -1103,7 +1124,7 @@ check: check-recursive all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) geo_config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(csvdir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(csvdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -1163,7 +1184,8 @@ info: info-recursive info-am: -install-data-am: install-dist_csvDATA install-includeHEADERS +install-data-am: install-dist_csvDATA install-includeHEADERS \ + install-nodist_includeHEADERS install-dvi: install-dvi-recursive @@ -1212,7 +1234,7 @@ ps: ps-recursive ps-am: uninstall-am: uninstall-dist_csvDATA uninstall-includeHEADERS \ - uninstall-libLTLIBRARIES + uninstall-libLTLIBRARIES uninstall-nodist_includeHEADERS .MAKE: $(am__recursive_targets) all install-am install-strip @@ -1228,13 +1250,15 @@ uninstall-am: uninstall-dist_csvDATA uninstall-includeHEADERS \ install-dist_csvDATA install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am \ install-includeHEADERS install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-libLTLIBRARIES install-man \ + install-nodist_includeHEADERS install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am uninstall-dist_csvDATA \ - uninstall-includeHEADERS uninstall-libLTLIBRARIES + uninstall-includeHEADERS uninstall-libLTLIBRARIES \ + uninstall-nodist_includeHEADERS @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@doxygen-ps: @DX_DOCDIR@/@[email protected] diff --git a/cpl_serv.c b/cpl_serv.c index 315c350..5ddb3d8 100644 --- a/cpl_serv.c +++ b/cpl_serv.c @@ -27,13 +27,6 @@ #include "cpl_serv.h" #include "geo_tiffp.h" -#ifdef HAVE_STRING_H -# include <string.h> -#endif -#if defined(HAVE_STRINGS_H) && !defined(HAVE_STRING_H) -# include <strings.h> -#endif - /************************************************************************/ /* CPLCalloc() */ /************************************************************************/ diff --git a/cpl_serv.h b/cpl_serv.h index e33a73a..c8511d3 100644 --- a/cpl_serv.h +++ b/cpl_serv.h @@ -33,7 +33,7 @@ /* Standard include files. */ /* ==================================================================== */ -#include "geo_config.h" +#include <geo_config.h> #include <stdio.h> #include <math.h> @@ -41,7 +41,7 @@ #ifdef HAVE_STRING_H # include <string.h> #endif -#ifdef HAVE_STRINGS_H +#if defined(HAVE_STRINGS_H) && !defined(_WIN32) # include <strings.h> #endif #ifdef HAVE_STDLIB_H diff --git a/geo_config.h b/geo_config.h deleted file mode 100644 index 54b392c..0000000 --- a/geo_config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* geo_config.h. Generated from geo_config.h.in by configure. */ -#ifndef GEO_CONFIG_H -#define GEO_CONFIG_H - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* Define if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 - -#define HAVE_LIBPROJ 1 -/* #undef HAVE_PROJECTS_H */ - -/* #undef GEO_NORMALIZE_DISABLE_TOWGS84 */ - -#endif /* ndef GEO_CONFIG_H */ diff --git a/geo_config.h.vc b/geo_config.h.vc index e1dbc0f..2cfe0b8 100644 --- a/geo_config.h.vc +++ b/geo_config.h.vc @@ -20,11 +20,6 @@ #define HAVE_STRING_H 1 #endif -/* Define if you have the <strings.h> header file. */ -#ifndef HAVE_STRINGS_H -#define HAVE_STRINGS_H 1 -#endif - /* Build as DLL */ #define BUILD_AS_DLL 1 diff --git a/geotiff.h b/geotiff.h index 799de57..d2e5689 100644 --- a/geotiff.h +++ b/geotiff.h @@ -32,7 +32,7 @@ #define LIBGEOTIFF_VERSION 1420 -#include "geo_config.h" +#include <geo_config.h> #include "geokeys.h" /********************************************************************** -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libgeotiff-dfsg.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
