[Git][debian-gis-team/postgis][upstream] New upstream version 2.5.0~rc1+dfsg

Bas Couwenberg gitlab at salsa.debian.org
Mon Aug 20 08:17:25 BST 2018


Bas Couwenberg pushed to branch upstream at Debian GIS Project / postgis


Commits:
e1fbd3c9 by Bas Couwenberg at 2018-08-20T06:39:16Z
New upstream version 2.5.0~rc1+dfsg
- - - - -


14 changed files:

- ChangeLog
- NEWS
- README.postgis
- Version.config
- configure
- configure.ac
- doc/release_notes.xml
- extensions/upgradeable_versions.mk
- postgis/gserialized_spgist_2d.c
- postgis/gserialized_spgist_3d.c
- postgis/sqldefines.h
- postgis_svn_revision.h
- utils/create_undef.pl
- utils/create_unpackaged.pl


Changes:

=====================================
ChangeLog
=====================================
The diff for this file was not included because it is too large.

=====================================
NEWS
=====================================
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+PostGIS 2.5.0rc1
+2018/08/19
+New since PostGIS 2.5.0beta2
+  - #4146, Fix compilation error against Postgres 12 (Raúl Marín).
+  - #4147, #4148, Honor SOURCE_DATE_EPOCH when present (Christoph Berg).
+
 PostGIS 2.5.0beta2
 2018/08/11
 New since PostGIS 2.5.0beta1


=====================================
README.postgis
=====================================
--- a/README.postgis
+++ b/README.postgis
@@ -1,8 +1,8 @@
 PostGIS - Geographic Information Systems Extensions to PostgreSQL
 =================================================================
 
-:Version: 2.5.0beta2
-:Date: 2018-08-11
+:Version: 2.5.0rc1
+:Date: 2018-08-19
 :Website: http://postgis.net
 
 This distribution contains a module which implements GIS simple features, ties


=====================================
Version.config
=====================================
--- a/Version.config
+++ b/Version.config
@@ -5,7 +5,7 @@
 
 POSTGIS_MAJOR_VERSION=2
 POSTGIS_MINOR_VERSION=5
-POSTGIS_MICRO_VERSION=0beta2
+POSTGIS_MICRO_VERSION=0rc1
 
 # Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
 # when changing POSTGIS_MINOR_VERSION


=====================================
configure
=====================================
--- a/configure
+++ b/configure
@@ -17236,7 +17236,7 @@ if test "$HAVE_LIBXML2" = "1"; then
 fi
 
 POSTGIS_LIB_VERSION="$POSTGIS_MAJOR_VERSION.$POSTGIS_MINOR_VERSION.$POSTGIS_MICRO_VERSION"
-POSTGIS_BUILD_DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
+POSTGIS_BUILD_DATE=`date ${SOURCE_DATE_EPOCH:+-d @$SOURCE_DATE_EPOCH} -u "+%Y-%m-%d %H:%M:%S"`
 POSTGIS_SCRIPTS_VERSION="$POSTGIS_LIB_VERSION"
 
 
@@ -17447,7 +17447,7 @@ _ACEOF
 
 				POSTGIS_RASTER_VERSION="$POSTGIS_RASTER_MAJOR_VERSION.$POSTGIS_RASTER_MINOR_VERSION"
 	POSTGIS_RASTER_LIB_VERSION="$POSTGIS_RASTER_MAJOR_VERSION.$POSTGIS_RASTER_MINOR_VERSION.$POSTGIS_RASTER_MICRO_VERSION"
-	POSTGIS_RASTER_BUILD_DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
+	POSTGIS_RASTER_BUILD_DATE=`date ${SOURCE_DATE_EPOCH:+-d @$SOURCE_DATE_EPOCH} -u "+%Y-%m-%d %H:%M:%S"`
 	POSTGIS_RASTER_SCRIPTS_VERSION="$POSTGIS_RASTER_LIB_VERSION"
 
 


=====================================
configure.ac
=====================================
--- a/configure.ac
+++ b/configure.ac
@@ -1075,7 +1075,7 @@ if test "$HAVE_LIBXML2" = "1"; then
 fi
 
 POSTGIS_LIB_VERSION="$POSTGIS_MAJOR_VERSION.$POSTGIS_MINOR_VERSION.$POSTGIS_MICRO_VERSION"
-POSTGIS_BUILD_DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
+POSTGIS_BUILD_DATE=`date ${SOURCE_DATE_EPOCH:+-d @$SOURCE_DATE_EPOCH} -u "+%Y-%m-%d %H:%M:%S"`
 POSTGIS_SCRIPTS_VERSION="$POSTGIS_LIB_VERSION"
 
 AC_DEFINE_UNQUOTED([POSTGIS_VERSION], ["$POSTGIS_VERSION"], [PostGIS version])
@@ -1253,7 +1253,7 @@ if test "x$with_raster" != "xno"; then
 	dnl ==============================
 	POSTGIS_RASTER_VERSION="$POSTGIS_RASTER_MAJOR_VERSION.$POSTGIS_RASTER_MINOR_VERSION"
 	POSTGIS_RASTER_LIB_VERSION="$POSTGIS_RASTER_MAJOR_VERSION.$POSTGIS_RASTER_MINOR_VERSION.$POSTGIS_RASTER_MICRO_VERSION"
-	POSTGIS_RASTER_BUILD_DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
+	POSTGIS_RASTER_BUILD_DATE=`date ${SOURCE_DATE_EPOCH:+-d @$SOURCE_DATE_EPOCH} -u "+%Y-%m-%d %H:%M:%S"`
 	POSTGIS_RASTER_SCRIPTS_VERSION="$POSTGIS_RASTER_LIB_VERSION"
 
 	AC_DEFINE_UNQUOTED([POSTGIS_RASTER_VERSION], ["$POSTGIS_RASTER_VERSION"], [PostGIS Raster version])


=====================================
doc/release_notes.xml
=====================================
--- a/doc/release_notes.xml
+++ b/doc/release_notes.xml
@@ -3,8 +3,8 @@
   <title>Appendix</title>
     <subtitle>Release Notes</subtitle>
     <sect1>
-      <title>Release 2.5.0beta2</title>
-      <para>Release date: 2018/08/11</para>
+      <title>Release 2.5.0rc1</title>
+      <para>Release date: 2018/08/19</para>
       <simplesect>
         <title>New Features</title>
         <para>#1847, spgist 2d and 3d support for PG 11+
@@ -86,6 +86,8 @@
         <para>#4060, #4094, PostgreSQL JIT support (Raúl Marín, Laurenz Albe)</para>
         <para>#4120, ST_AsMVTGeom: Clip using tile coordinates (Raúl Marín).</para>
         <para>#4145, Speedup MVT column parsing (Raúl Marín)</para>
+        <para>#4146, Fix compilation error against Postgres 12 (Raúl Marín).</para>
+        <para>#4147, #4148, Honor SOURCE_DATE_EPOCH when present (Christoph Berg)</para>
       </simplesect>
     </sect1>
 


=====================================
extensions/upgradeable_versions.mk
=====================================
--- a/extensions/upgradeable_versions.mk
+++ b/extensions/upgradeable_versions.mk
@@ -38,4 +38,5 @@ UPGRADEABLE_VERSIONS = \
 	2.4.2 \
 	2.4.3 \
 	2.4.4 \
-	2.5.0beta1
+	2.5.0beta1 \
+	2.5.0beta2


=====================================
postgis/gserialized_spgist_2d.c
=====================================
--- a/postgis/gserialized_spgist_2d.c
+++ b/postgis/gserialized_spgist_2d.c
@@ -155,7 +155,7 @@ static RectBox *
 initRectBox(void)
 {
 	RectBox *rect_box = (RectBox *)palloc(sizeof(RectBox));
-	float infinity = get_float4_infinity();
+	float infinity = FLT_MAX;
 
 	rect_box->left.xmin = -infinity;
 	rect_box->left.xmax = infinity;


=====================================
postgis/gserialized_spgist_3d.c
=====================================
--- a/postgis/gserialized_spgist_3d.c
+++ b/postgis/gserialized_spgist_3d.c
@@ -74,6 +74,8 @@
 #include "lwgeom_box3d.h"
 #include "lwgeom_pg.h"
 
+#include <float.h>
+
 PG_FUNCTION_INFO_V1(gserialized_overlaps_3d);
 Datum gserialized_overlaps_3d(PG_FUNCTION_ARGS)
 {
@@ -189,7 +191,7 @@ static CubeBox3D *
 initCubeBox(void)
 {
 	CubeBox3D *cube_box = (CubeBox3D *)palloc(sizeof(CubeBox3D));
-	double infinity = get_float8_infinity();
+	double infinity = DBL_MAX;
 
 	cube_box->left.xmin = -infinity;
 	cube_box->left.xmax = infinity;


=====================================
postgis/sqldefines.h
=====================================
--- a/postgis/sqldefines.h
+++ b/postgis/sqldefines.h
@@ -9,7 +9,7 @@
 #define POSTGIS_PGSQL_VERSION 96
 #define POSTGIS_GEOS_VERSION 36
 #define POSTGIS_PROJ_VERSION 51
-#define POSTGIS_LIB_VERSION '2.5.0beta2'
+#define POSTGIS_LIB_VERSION '2.5.0rc1'
 #define POSTGIS_LIBXML2_VERSION 2.9.4
 #define POSTGIS_SFCGAL_VERSION 13
 
@@ -25,13 +25,13 @@
  * won't substitute within apostrophes)
  */
 #define _POSTGIS_SQL_SELECT_POSTGIS_VERSION 'SELECT ''2.5 USE_GEOS=1 USE_PROJ=1 USE_STATS=1''::text AS version'
-#define _POSTGIS_SQL_SELECT_POSTGIS_BUILD_DATE 'SELECT ''2018-08-11 10:14:46''::text AS version'
+#define _POSTGIS_SQL_SELECT_POSTGIS_BUILD_DATE 'SELECT ''2018-08-19 21:47:02''::text AS version'
 #define _POSTGIS_SQL_SELECT_POSTGIS_PGSQL_VERSION 'SELECT ''96''::text AS version'
 
 #ifdef POSTGIS_SVN_REVISION
-#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION $$ SELECT '2.5.0beta2'::text || ' r' || POSTGIS_SVN_REVISION::text AS version $$
+#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION $$ SELECT '2.5.0rc1'::text || ' r' || POSTGIS_SVN_REVISION::text AS version $$
 #else
-#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION $$ SELECT '2.5.0beta2'::text AS version $$
+#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION $$ SELECT '2.5.0rc1'::text AS version $$
 #endif
 
 #define SRID_USR_MAX 998999


=====================================
postgis_svn_revision.h
=====================================
--- a/postgis_svn_revision.h
+++ b/postgis_svn_revision.h
@@ -1 +1 @@
-#define POSTGIS_SVN_REVISION 16690
+#define POSTGIS_SVN_REVISION 16698


=====================================
utils/create_undef.pl
=====================================
--- a/utils/create_undef.pl
+++ b/utils/create_undef.pl
@@ -55,7 +55,7 @@ sub strip_default {
 	return $line;
 }
 
-my $time = POSIX::strftime("%c", localtime);
+my $time = POSIX::strftime("%F %T", gmtime(defined($ENV{SOURCE_DATE_EPOCH}) ? $ENV{SOURCE_DATE_EPOCH} : time));
 print "-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --\n";
 print "--\n";
 print "-- PostGIS - Spatial Types for PostgreSQL\n";


=====================================
utils/create_unpackaged.pl
=====================================
--- a/utils/create_unpackaged.pl
+++ b/utils/create_unpackaged.pl
@@ -145,7 +145,7 @@ END;
 EOF
 }
 
-my $time = POSIX::strftime("%c", localtime);
+my $time = POSIX::strftime("%F %T", gmtime(defined($ENV{SOURCE_DATE_EPOCH}) ? $ENV{SOURCE_DATE_EPOCH} : time));
 print "-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --\n";
 print "--\n";
 print "-- PostGIS - Spatial Types for PostgreSQL\n";



View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/commit/e1fbd3c95cefac9a1a51ff35fdcf763ba4b3d76b

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/commit/e1fbd3c95cefac9a1a51ff35fdcf763ba4b3d76b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180820/d8b9152d/attachment-0001.html>


More information about the Pkg-grass-devel mailing list