Prepare for GDAL 3.0.4

Author: rouault

gdal/GDALmake.opt.in

@@ -123,7 +123,7 @@ GDAL_INCLUDE	=	-I$(GDAL_ROOT)/port -I$(GDAL_ROOT)/gcore \
 # libtool targets and help variables
 LIBGDAL	:=		libgdal.la
 LIBGDAL_CURRENT	:=	26
-LIBGDAL_REVISION	:=	3
+LIBGDAL_REVISION	:=	4
 LIBGDAL_AGE	:=	0
 
 # native build targets and variables

gdal/NEWS

@@ -1,3 +1,41 @@
+= GDAL/OGR 3.0.4 Release Notes =
+
+The 3.0.4 release is a bug fix release.
+
+== Build ==
+
+ * Fix build against Poppler 0.85dev
+ * Fix build against latest librasterlite2
+
+== Other ==
+
+ * Remove execution right from ogr/*.png (#2184)
+
+== GDAL utilities ==
+
+ * gdalinfo: fix axis order issue in lon,lat corner coordinates, in particular when reading from a .aux.xml with a ProjectedCRS (#2195)
+
+== GDAL drivers ==
+
+GTiff driver:
+ * Do not write by default EPSG:3857/WebMercator as a ESRI PE string. Fixes 3.0 regression
+
+HDF5 driver:
+ * fix reading single dimension dataset (#2180)
+
+PDF driver:
+ * fix null pointer dereference or infinite recursion/stack overflow on corrupted file. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=20033
+ * fix excessive memory consumption on corrupted files
+
+== OGR drivers ==
+
+MTAB driver:
+ * Fix dataset access mode (#2170)
+
+NGW driver:
+ * Fix dataset access mode
+ * Add support for layers geometry types with Z
+
 = GDAL/OGR 3.0.3 Release Notes =
 
 The 3.0.3 release is a bug fix release.

gdal/VERSION

@@ -1 +1 @@
-3.0.3
+3.0.4

gdal/gcore/gdal_version.h.in

@@ -7,7 +7,7 @@
 #ifndef GDAL_VERSION_MAJOR
 #  define GDAL_VERSION_MAJOR    3
 #  define GDAL_VERSION_MINOR    0
-#  define GDAL_VERSION_REV      3
+#  define GDAL_VERSION_REV      4
 #  define GDAL_VERSION_BUILD    0
 #endif
 
@@ -24,9 +24,9 @@
 
 #if !defined(DO_NOT_DEFINE_GDAL_RELEASE_DATE_AND_GDAL_RELEASE_NAME)
 #ifndef GDAL_RELEASE_DATE
-#  define GDAL_RELEASE_DATE     20200108
+#  define GDAL_RELEASE_DATE     20200128
 #endif
 #ifndef GDAL_RELEASE_NAME
-#  define GDAL_RELEASE_NAME     "3.0.3"
+#  define GDAL_RELEASE_NAME     "3.0.4"
 #endif
 #endif

gdal/swig/include/perl/gdal_perl.i

@@ -143,8 +143,8 @@ use Geo::GDAL::Const;
 # Note that the 1/100000 digits may be used to create more than one
 # CPAN release from one GDAL release.
 
-our $VERSION = '3.0003';
-our $GDAL_VERSION = '3.0.3';
+our $VERSION = '3.0004';
+our $GDAL_VERSION = '3.0.4';
 
 =pod
 

gdal/swig/include/perl/ogr_perl.i

@@ -126,7 +126,7 @@ ALTERED_DESTROY(OGRGeometryShadow, OGRc, delete_Geometry)
 %perlcode %{
 
 package Geo::OGR;
-our $VERSION = '3.0003'; # this needs to be the same as that in gdal_perl.i
+our $VERSION = '3.0004'; # this needs to be the same as that in gdal_perl.i
 
 Geo::GDAL->import(qw(:INTERNAL));
 

gdal/swig/python/README.rst

@@ -16,7 +16,7 @@ reference documentation, but the `GDAL API Tutorial`_ includes Python examples.
 Dependencies
 ------------
 
- * libgdal (3.0.3 or greater) and header files (gdal-devel)
+ * libgdal (3.0.4 or greater) and header files (gdal-devel)
  * numpy (1.0.0 or greater) and header files (numpy-devel) (not explicitly 
    required, but many examples and utilities will not work without it)
 

gdal/swig/python/setup.py

@@ -7,7 +7,7 @@
 # Howard Butler hobu.inc@gmail.com
 
 
-gdal_version = '3.0.3'
+gdal_version = '3.0.4'
 
 import sys
 import os