Prepare for GDAL 3.5.0 release

fvankrieken · May 6, 2022 · c221336 · c221336
1 parent 3ce520f
commit c221336
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/GDALmake.opt.in b/GDALmake.opt.in
@@ -127,7 +127,7 @@ GDAL_INCLUDE	=	-iquote $(GDAL_ROOT)/port -iquote $(GDAL_ROOT)/generated_headers
 
 # libtool targets and help variables
 LIBGDAL	:=		libgdal.la
-LIBGDAL_CURRENT	:=	30
+LIBGDAL_CURRENT	:=	31
 LIBGDAL_REVISION	:=	0
 LIBGDAL_AGE	:=	0
 

diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE
@@ -53,12 +53,7 @@ Process :
      - ./swig/python/gdal-utils/osgeo_utils/__init__.py (gdal-utils python package)
      - ./swig/python/README.rst (libgdal)
 
-3.2) Update ./swig/include/perl/gdal_perl.i $VERSION and $GDAL_VERSION
-strings to current version. Update also $VERSION in
-./swig/include/perl/ogr_perl.i to the same as the other $VERSION. Kick
-Perl module maintainer to make a CPAN release.
-
-3.3) For major releases update the VERSION macro in nmake.opt (for 1.6, 1.7etc)
+3.2) For major releases update the VERSION macro in nmake.opt (for 1.6, 1.7etc)
 
 4) Update LIBGDAL_CURRENT/REVISION/AGE macros in GDALmake.opt.in.
    - For a release with no interface changes just bump REVISION.

diff --git a/gcore/gdal_version.h.in b/gcore/gdal_version.h.in
@@ -24,9 +24,9 @@
 
 #if !defined(DO_NOT_DEFINE_GDAL_DATE_NAME)
 #ifndef GDAL_RELEASE_DATE
-#  define GDAL_RELEASE_DATE     20229999
+#  define GDAL_RELEASE_DATE     20220506
 #endif
 #ifndef GDAL_RELEASE_NAME
-#  define GDAL_RELEASE_NAME     "3.5.0dev"
+#  define GDAL_RELEASE_NAME     "3.5.0"
 #endif
 #endif
diff --git a/nmake.opt b/nmake.opt
@@ -226,7 +226,7 @@ STDCALL=YES
 # Version number embedded in DLL name.
 # If GDAL version is X.Y.Z, VERSION = X * 100 + Y
 !IFNDEF VERSION
-VERSION =	303
+VERSION =	305
 !ENDIF
 
 # Set HAVE_ATLBASE_H=NO if atlbase.h header is not available

diff --git a/swig/python/README.rst b/swig/python/README.rst
@@ -16,7 +16,7 @@ reference documentation, but the `GDAL API Tutorial`_ includes Python examples.
 Dependencies
 ------------
 
- * libgdal (3.3.0 or greater) and header files (gdal-devel)
+ * libgdal (3.5.0 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)
 

diff --git a/swig/python/gdal-utils/osgeo_utils/__init__.py b/swig/python/gdal-utils/osgeo_utils/__init__.py
@@ -1,5 +1,5 @@
 __package_name__ = 'gdal-utils'
-gdal_utils_version = (3, 4, 99, 0)
+gdal_utils_version = (3, 5, 0, 0)
 __version__ = '.'.join(str(i) for i in gdal_utils_version)
 __author__ = "Frank Warmerdam"
 __author_email__ = "[email protected]"