Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -203,7 +203,7 @@ web-update:	docs
 	$(INSTALL_DIR) $(INST_HTML)
 	cp html/*.* $(INST_HTML)

-install:	default install-actions
+install:	install-actions

 install-static-lib: static-lib gdal.pc
 	$(INSTALL_LIB) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
@@ -255,7 +255,7 @@ endif

 ifeq ($(HAVE_LIBTOOL),yes)

-install-lib:
+install-lib: default
 	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
 	for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(DESTDIR)$(INST_LIB) ; done
 ifeq ($(MACOSX_FRAMEWORK),yes)
@@ -278,7 +278,7 @@ ifeq ($(HAVE_LD_SHARED),yes)

 GDAL_SLIB_B	=	$(notdir $(GDAL_SLIB))

-install-lib:
+install-lib: default

 	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
 ifeq ($(MACOSX_FRAMEWORK),yes)
@@ -297,7 +297,7 @@ endif

 else

-install-lib:
+install-lib: default
 	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
 	$(INSTALL_LIB) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)


--- a/HOWTO-RELEASE
+++ b/HOWTO-RELEASE
@@ -41,6 +41,7 @@ Process :
      must also be edited before if new utilities/scripts are added/removed.

 2) Update the release date, and number information in gcore/gdal_version.h.in
+   (*NOT* gdal_version.h which is a generated file)
   Note: the format of GDAL_RELEASE_DATE should be YYYYMMDD.

 3) Update the VERSION file.

--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ All:
 Unix:
 * update GRASS drivers to support GRASS 7.4.0 (#633)
 * configure: use CXXFLAGS when CXX is used (#693)
+ * GNUmakefile: fix dependency of install target (fixes #707)
  
 Windows:
 * MBTILES: remove extra parenthesis around $(ZLIB_FLAGS)

--- a/debian/changelog
+++ b/debian/changelog
+gdal (2.3.1~rc2+dfsg-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Drop parallel build patch, fixed with upstream patch.
+  * Update symbols for 2.3.1~rc1.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 23 Jun 2018 19:27:04 +0200
+
 gdal (2.3.1~rc1+dfsg-1~exp1) experimental; urgency=medium

  * New upstream release candidate.

--- a/debian/libgdal20.symbols.amd64
+++ b/debian/libgdal20.symbols.amd64
@@ -3922,6 +3922,9 @@ libgdal.so.20 libgdal20 #MINVER#
 (c++)"std::__cxx11::list<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::unique()@Base" 2.0.1 1
 (c++)"std::pair<std::_Rb_tree_iterator<OGRwkbGeometryType>, bool> std::_Rb_tree<OGRwkbGeometryType, OGRwkbGeometryType, std::_Identity<OGRwkbGeometryType>, std::less<OGRwkbGeometryType>, std::allocator<OGRwkbGeometryType> >::_M_insert_unique<OGRwkbGeometryType const&>(OGRwkbGeometryType const&)@Base" 2.3.0 1
 (c++)"std::_Rb_tree<OGRwkbGeometryType, OGRwkbGeometryType, std::_Identity<OGRwkbGeometryType>, std::less<OGRwkbGeometryType>, std::allocator<OGRwkbGeometryType> >::_M_erase(std::_Rb_tree_node<OGRwkbGeometryType>*)@Base" 2.3.0 1
+ (c++)"std::_Rb_tree<geokey_t, std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<geokey_t>, std::allocator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_get_insert_unique_pos(geokey_t const&)@Base" 2.3.1~rc1 1
+ (c++)"std::_Rb_tree<geokey_t, std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<geokey_t>, std::allocator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_get_insert_hint_unique_pos(std::_Rb_tree_const_iterator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, geokey_t const&)@Base" 2.3.1~rc1 1
+ (c++)"std::_Rb_tree<geokey_t, std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<geokey_t>, std::allocator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_erase(std::_Rb_tree_node<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >*)@Base" 2.3.1~rc1 1
 (c++)"std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::equal_range(CPLString const&)@Base" 2.0.1 1
 (c++)"std::pair<std::_Rb_tree_iterator<CPLString>, bool> std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::_M_insert_unique<CPLString const&>(CPLString const&)@Base" 2.1.1 1
 (c++)"std::pair<std::_Rb_tree_iterator<CPLString>, bool> std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::_M_insert_unique<CPLString>(CPLString&&)@Base" 2.1.1 1

--- a/debian/libgdal20.symbols.arm64
+++ b/debian/libgdal20.symbols.arm64
@@ -3922,6 +3922,9 @@ libgdal.so.20 libgdal20 #MINVER#
 (c++)"std::__cxx11::list<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::unique()@Base" 2.0.1 1
 (c++)"std::pair<std::_Rb_tree_iterator<OGRwkbGeometryType>, bool> std::_Rb_tree<OGRwkbGeometryType, OGRwkbGeometryType, std::_Identity<OGRwkbGeometryType>, std::less<OGRwkbGeometryType>, std::allocator<OGRwkbGeometryType> >::_M_insert_unique<OGRwkbGeometryType const&>(OGRwkbGeometryType const&)@Base" 2.3.0 1
 (c++)"std::_Rb_tree<OGRwkbGeometryType, OGRwkbGeometryType, std::_Identity<OGRwkbGeometryType>, std::less<OGRwkbGeometryType>, std::allocator<OGRwkbGeometryType> >::_M_erase(std::_Rb_tree_node<OGRwkbGeometryType>*)@Base" 2.3.0 1
+ (c++)"std::_Rb_tree<geokey_t, std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<geokey_t>, std::allocator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_get_insert_unique_pos(geokey_t const&)@Base" 2.3.1~rc1 1
+ (c++)"std::_Rb_tree<geokey_t, std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<geokey_t>, std::allocator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_get_insert_hint_unique_pos(std::_Rb_tree_const_iterator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, geokey_t const&)@Base" 2.3.1~rc1 1
+ (c++)"std::_Rb_tree<geokey_t, std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<geokey_t>, std::allocator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_erase(std::_Rb_tree_node<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >*)@Base" 2.3.1~rc1 1
 (c++)"std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::equal_range(CPLString const&)@Base" 2.0.1 1
 (c++)"std::pair<std::_Rb_tree_iterator<CPLString>, bool> std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::_M_insert_unique<CPLString const&>(CPLString const&)@Base" 2.1.1 1
 (c++)"std::pair<std::_Rb_tree_iterator<CPLString>, bool> std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::_M_insert_unique<CPLString>(CPLString&&)@Base" 2.1.1 1

--- a/debian/libgdal20.symbols.i386
+++ b/debian/libgdal20.symbols.i386
@@ -3923,6 +3923,8 @@ libgdal.so.20 libgdal20 #MINVER#
 (c++)"std::__cxx11::list<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::unique()@Base" 2.0.1 1
 (c++)"std::pair<std::_Rb_tree_iterator<OGRwkbGeometryType>, bool> std::_Rb_tree<OGRwkbGeometryType, OGRwkbGeometryType, std::_Identity<OGRwkbGeometryType>, std::less<OGRwkbGeometryType>, std::allocator<OGRwkbGeometryType> >::_M_insert_unique<OGRwkbGeometryType const&>(OGRwkbGeometryType const&)@Base" 2.3.0 1
 (c++)"std::_Rb_tree<OGRwkbGeometryType, OGRwkbGeometryType, std::_Identity<OGRwkbGeometryType>, std::less<OGRwkbGeometryType>, std::allocator<OGRwkbGeometryType> >::_M_erase(std::_Rb_tree_node<OGRwkbGeometryType>*)@Base" 2.3.0 1
+ (c++)"std::_Rb_tree<geokey_t, std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<geokey_t>, std::allocator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_get_insert_unique_pos(geokey_t const&)@Base" 2.3.1~rc1 1
+ (c++)"std::_Rb_tree<geokey_t, std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<geokey_t>, std::allocator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_erase(std::_Rb_tree_node<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >*)@Base" 2.3.1~rc1 1
 (c++)"std::pair<std::_Rb_tree_iterator<CPLString>, bool> std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::_M_insert_unique<CPLString const&>(CPLString const&)@Base" 2.1.1 1
 (c++)"std::pair<std::_Rb_tree_iterator<CPLString>, bool> std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::_M_insert_unique<CPLString>(CPLString&&)@Base" 2.1.1 1
 (c++)"std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::_M_get_insert_unique_pos(CPLString const&)@Base" 2.1.1 1

--- a/debian/libgdal20.symbols.powerpc
+++ b/debian/libgdal20.symbols.powerpc
@@ -3923,6 +3923,8 @@ libgdal.so.20 libgdal20 #MINVER#
 (c++)"std::__cxx11::list<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::unique()@Base" 2.0.1 1
 (c++)"std::pair<std::_Rb_tree_iterator<OGRwkbGeometryType>, bool> std::_Rb_tree<OGRwkbGeometryType, OGRwkbGeometryType, std::_Identity<OGRwkbGeometryType>, std::less<OGRwkbGeometryType>, std::allocator<OGRwkbGeometryType> >::_M_insert_unique<OGRwkbGeometryType const&>(OGRwkbGeometryType const&)@Base" 2.3.0 1
 (c++)"std::_Rb_tree<OGRwkbGeometryType, OGRwkbGeometryType, std::_Identity<OGRwkbGeometryType>, std::less<OGRwkbGeometryType>, std::allocator<OGRwkbGeometryType> >::_M_erase(std::_Rb_tree_node<OGRwkbGeometryType>*)@Base" 2.3.0 1
+ (c++)"std::_Rb_tree<geokey_t, std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<geokey_t>, std::allocator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_get_insert_unique_pos(geokey_t const&)@Base" 2.3.1~rc1 1
+ (c++)"std::_Rb_tree<geokey_t, std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<geokey_t>, std::allocator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_erase(std::_Rb_tree_node<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >*)@Base" 2.3.1~rc1 1
 (c++)"std::pair<std::_Rb_tree_iterator<CPLString>, bool> std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::_M_insert_unique<CPLString const&>(CPLString const&)@Base" 2.1.1 1
 (c++)"std::pair<std::_Rb_tree_iterator<CPLString>, bool> std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::_M_insert_unique<CPLString>(CPLString&&)@Base" 2.1.1 1
 (c++)"std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::_M_get_insert_unique_pos(CPLString const&)@Base" 2.1.1 1

--- a/debian/libgdal20.symbols.ppc64el
+++ b/debian/libgdal20.symbols.ppc64el
@@ -3923,6 +3923,9 @@ libgdal.so.20 libgdal20 #MINVER#
 (c++)"std::__cxx11::list<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::unique()@Base" 2.0.1 1
 (c++)"std::pair<std::_Rb_tree_iterator<OGRwkbGeometryType>, bool> std::_Rb_tree<OGRwkbGeometryType, OGRwkbGeometryType, std::_Identity<OGRwkbGeometryType>, std::less<OGRwkbGeometryType>, std::allocator<OGRwkbGeometryType> >::_M_insert_unique<OGRwkbGeometryType const&>(OGRwkbGeometryType const&)@Base" 2.3.0 1
 (c++)"std::_Rb_tree<OGRwkbGeometryType, OGRwkbGeometryType, std::_Identity<OGRwkbGeometryType>, std::less<OGRwkbGeometryType>, std::allocator<OGRwkbGeometryType> >::_M_erase(std::_Rb_tree_node<OGRwkbGeometryType>*)@Base" 2.3.0 1
+ (c++)"std::_Rb_tree<geokey_t, std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<geokey_t>, std::allocator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_get_insert_unique_pos(geokey_t const&)@Base" 2.3.1~rc1 1
+ (c++)"std::_Rb_tree<geokey_t, std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<geokey_t>, std::allocator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_get_insert_hint_unique_pos(std::_Rb_tree_const_iterator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, geokey_t const&)@Base" 2.3.1~rc1 1
+ (c++)"std::_Rb_tree<geokey_t, std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<geokey_t>, std::allocator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_erase(std::_Rb_tree_node<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >*)@Base" 2.3.1~rc1 1
 (c++)"std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::equal_range(CPLString const&)@Base" 2.0.1 1
 (c++)"std::pair<std::_Rb_tree_iterator<CPLString>, bool> std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::_M_insert_unique<CPLString const&>(CPLString const&)@Base" 2.1.1 1
 (c++)"std::pair<std::_Rb_tree_iterator<CPLString>, bool> std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::_M_insert_unique<CPLString>(CPLString&&)@Base" 2.1.1 1

--- a/debian/libgdal20.symbols.s390x
+++ b/debian/libgdal20.symbols.s390x
@@ -3923,6 +3923,8 @@ libgdal.so.20 libgdal20 #MINVER#
 (c++)"std::__cxx11::list<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::unique()@Base" 2.0.1 1
 (c++)"std::pair<std::_Rb_tree_iterator<OGRwkbGeometryType>, bool> std::_Rb_tree<OGRwkbGeometryType, OGRwkbGeometryType, std::_Identity<OGRwkbGeometryType>, std::less<OGRwkbGeometryType>, std::allocator<OGRwkbGeometryType> >::_M_insert_unique<OGRwkbGeometryType const&>(OGRwkbGeometryType const&)@Base" 2.3.0 1
 (c++)"std::_Rb_tree<OGRwkbGeometryType, OGRwkbGeometryType, std::_Identity<OGRwkbGeometryType>, std::less<OGRwkbGeometryType>, std::allocator<OGRwkbGeometryType> >::_M_erase(std::_Rb_tree_node<OGRwkbGeometryType>*)@Base" 2.3.0 1
+ (c++)"std::_Rb_tree<geokey_t, std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<geokey_t>, std::allocator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_get_insert_unique_pos(geokey_t const&)@Base" 2.3.1~rc1 1
+ (c++)"std::_Rb_tree<geokey_t, std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<geokey_t>, std::allocator<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_erase(std::_Rb_tree_node<std::pair<geokey_t const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >*)@Base" 2.3.1~rc1 1
 (c++)"std::pair<std::_Rb_tree_iterator<CPLString>, bool> std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::_M_insert_unique<CPLString const&>(CPLString const&)@Base" 2.1.1 1
 (c++)"std::pair<std::_Rb_tree_iterator<CPLString>, bool> std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::_M_insert_unique<CPLString>(CPLString&&)@Base" 2.1.1 1
 (c++)"std::_Rb_tree<CPLString, CPLString, std::_Identity<CPLString>, std::less<CPLString>, std::allocator<CPLString> >::_M_get_insert_unique_pos(CPLString const&)@Base" 2.1.1 1

--- a/debian/patches/perl-parallel.patch
+++ b/debian/patches/perl-parallel.patch
-Description: Fix parallel build failure.
- Reverts 6abc41e68c5385f97cf9dea25b0e87cd9382c92d
-Author: Bas Couwenberg <sebastic@debian.org>
-Bug: https://github.com/OSGeo/gdal/issues/707
-
--- a/swig/perl/GNUmakefile
-+++ b/swig/perl/GNUmakefile
-@@ -29,7 +29,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL
- 
- gdal_wrap.cc: generate
- 
-Makefile_Geo__GDAL: gdal_wrap.cc
-+Makefile_Geo__GDAL:
- 	perl Makefile.PL INSTALLDIRS=vendor
- 
- test: build
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,3 @@ perl-vendor
 privacy-breach-logo.patch
 privacy-breach-generic.patch
 perl-doxyfile
-perl-parallel.patch
--- a/man/man1/gdal-config.1
+++ b/man/man1/gdal-config.1
-.TH "gdal-config" 1 "Fri Jun 22 2018" "GDAL" \" -*- nroff -*-
+.TH "gdal-config" 1 "Sat Jun 23 2018" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

--- a/man/man1/gdal2tiles.1
+++ b/man/man1/gdal2tiles.1
-.TH "gdal2tiles" 1 "Fri Jun 22 2018" "GDAL" \" -*- nroff -*-
+.TH "gdal2tiles" 1 "Sat Jun 23 2018" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

--- a/man/man1/gdal_calc.1
+++ b/man/man1/gdal_calc.1
-.TH "gdal_calc" 1 "Fri Jun 22 2018" "GDAL" \" -*- nroff -*-
+.TH "gdal_calc" 1 "Sat Jun 23 2018" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

--- a/man/man1/gdal_contour.1
+++ b/man/man1/gdal_contour.1
-.TH "gdal_contour" 1 "Fri Jun 22 2018" "GDAL" \" -*- nroff -*-
+.TH "gdal_contour" 1 "Sat Jun 23 2018" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

--- a/man/man1/gdal_edit.1
+++ b/man/man1/gdal_edit.1
-.TH "gdal_edit" 1 "Fri Jun 22 2018" "GDAL" \" -*- nroff -*-
+.TH "gdal_edit" 1 "Sat Jun 23 2018" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

--- a/man/man1/gdal_fillnodata.1
+++ b/man/man1/gdal_fillnodata.1
-.TH "gdal_fillnodata" 1 "Fri Jun 22 2018" "GDAL" \" -*- nroff -*-
+.TH "gdal_fillnodata" 1 "Sat Jun 23 2018" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

--- a/man/man1/gdal_grid.1
+++ b/man/man1/gdal_grid.1
-.TH "gdal_grid" 1 "Fri Jun 22 2018" "GDAL" \" -*- nroff -*-
+.TH "gdal_grid" 1 "Sat Jun 23 2018" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME

--- a/man/man1/gdal_merge.1
+++ b/man/man1/gdal_merge.1
-.TH "gdal_merge" 1 "Fri Jun 22 2018" "GDAL" \" -*- nroff -*-
+.TH "gdal_merge" 1 "Sat Jun 23 2018" "GDAL" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME