Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ set (PROJECT_SOURCE_DIR src)
 # The version number.
 set (PKTOOLS_VERSION_MAJOR 2)
 set (PKTOOLS_VERSION_MINOR 6)
-set (PKTOOLS_VERSION_PATCH 7.3)
+set (PKTOOLS_VERSION_PATCH 7.4)
 set (PKTOOLS_VERSION "${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
 set (PKTOOLS_PACKAGE_VERSION "${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
 set (PKTOOLS_PACKAGE_STRING "PKTOOLS ${PKTOOLS_VERSION_MAJOR}.${PKTOOLS_VERSION_MINOR}.${PKTOOLS_VERSION_PATCH}")
@@ -164,7 +164,7 @@ else()

    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ${PKTOOLS_COMMON_CXX_FLAGS}")
    if (CMAKE_COMPILER_IS_GNUCXX)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
    endif()

  elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")

--- a/debian/changelog
+++ b/debian/changelog
-pktools (2.6.7.3+ds-4) UNRELEASED; urgency=medium
+pktools (2.6.7.4+ds-1) unstable; urgency=medium

+  * New upstream release.
  * Bump Standards-Version to 4.2.0, no changes.
+  * Drop gdal-c++11.patch, applied upstream.
+  * Update symbols for amd64.

- -- Bas Couwenberg <sebastic@debian.org>  Sun, 05 Aug 2018 20:43:19 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 19 Aug 2018 14:27:45 +0200

 pktools (2.6.7.3+ds-3) unstable; urgency=medium


--- a/debian/libalgorithms1.symbols
+++ b/debian/libalgorithms1.symbols
-# SymbolsHelper-Confirmed: 2.6.7.3 amd64
+# SymbolsHelper-Confirmed: 2.6.7.4 amd64
 libalgorithms.so.1 libalgorithms1 #MINVER#
 (optional=templinst|arch=alpha amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el s390x sparc64)_Z11string2typeIiET_RKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 2.6.4
 _Z12compareClassRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_@Base 2.6.4
@@ -239,21 +239,18 @@ libalgorithms.so.1 libalgorithms1 #MINVER#
 (optional=templinst)_ZNK8Vector2dIdE3sumEv@Base 2.5.2
 (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc@Base 2.5.2
 (optional=templinst|arch=hppa x32)_ZNKSt6vectorI8Vector2dIfESaIS1_EE12_M_check_lenEjPKc@Base 2.6.7
- (optional=templinst)_ZNSt22__uninitialized_fill_nILb0EE15__uninit_fill_nIPSt6vectorIdSaIdEEmS4_EET_S6_T0_RKT1_@Base 2.6.7.3
 (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN11statfactory11StatFactory18INTERPOLATION_TYPEESt4lessIS5_ESaISt4pairIKS5_S8_EEEixEOS5_@Base 2.6.7.3
 (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN6filter11FILTER_TYPEESt4lessIS5_ESaISt4pairIKS5_S7_EEEixEOS5_@Base 2.6.7.3
 (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN8filter2d11FILTER_TYPEESt4lessIS5_ESaISt4pairIKS5_S7_EEEixEOS5_@Base 2.6.7.3
 (optional=templinst)_ZNSt3mapIliSt4lessIlESaISt4pairIKliEEEixEOl@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorI8Vector2dIfESaIS1_EE17_M_default_appendEm@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_default_appendEm@Base 2.6.7.3
- (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS5_S7_EERKS5_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJRKS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED1Ev@Base 2.6.4
 (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED2Ev@Base 2.6.4
 (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EEaSERKS7_@Base 2.6.4
 (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIS_IdSaIdEESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.6.4
 (optional=templinst)_ZNSt6vectorIS_IdSaIdEESaIS1_EE17_M_default_appendEm@Base 2.6.7.3
- (optional=templinst)_ZNSt6vectorIS_IdSaIdEESaIS1_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIS_IdSaIdEESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIS_IdSaIdEESaIS1_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE@Base 2.5.2
 (optional=templinst)_ZNSt6vectorIS_IdSaIdEESaIS1_EE9push_backERKS1_@Base 2.6.7.3
@@ -261,13 +258,11 @@ libalgorithms.so.1 libalgorithms1 #MINVER#
 (optional=templinst)_ZNSt6vectorIS_IdSaIdEESaIS1_EED2Ev@Base 2.5.2
 (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIS_IfSaIfEESaIS1_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EEjRKS1_@Base 2.6.4
 (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EE17_M_default_appendEm@Base 2.6.7.3
- (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS1_S3_EES7_@Base 2.5.2
 (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EED1Ev@Base 2.5.2
 (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EED2Ev@Base 2.5.2
 (optional=templinst)_ZNSt6vectorIS_IsSaIsEESaIS1_EE17_M_default_appendEm@Base 2.6.7.3
- (optional=templinst)_ZNSt6vectorIS_IsSaIsEESaIS1_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIS_IsSaIsEESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIS_IsSaIsEESaIS1_EED1Ev@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIS_IsSaIsEESaIS1_EED2Ev@Base 2.6.7.3
@@ -276,10 +271,7 @@ libalgorithms.so.1 libalgorithms1 #MINVER#
 (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIdSaIdEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPdS1_EEjRKd@Base 2.6.4
 (optional=templinst)_ZNSt6vectorIdSaIdEE15_M_range_insertIN9__gnu_cxx17__normal_iteratorIPdS1_EEEEvS6_T_S7_St20forward_iterator_tag@Base 2.6.7
 (optional=templinst)_ZNSt6vectorIdSaIdEE17_M_default_appendEm@Base 2.6.7.3
- (optional=templinst)_ZNSt6vectorIdSaIdEE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPdS1_EERKd@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIdSaIdEE17_M_realloc_insertIJRKdEEEvN9__gnu_cxx17__normal_iteratorIPdS1_EEDpOT_@Base 2.6.7.3
- (optional=templinst)_ZNSt6vectorIdSaIdEE6resizeEm@Base 2.6.7.3
- (optional=templinst)_ZNSt6vectorIdSaIdEE6resizeEmd@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIdSaIdEE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPdS1_EE@Base 2.6.2
 (optional=templinst)_ZNSt6vectorIdSaIdEE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPdS1_EES5_@Base 2.5.2
 (optional=templinst)_ZNSt6vectorIdSaIdEEC1ERKS1_@Base 2.6.4
@@ -292,7 +284,6 @@ libalgorithms.so.1 libalgorithms1 #MINVER#
 (optional=templinst|arch=!alpha !amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !sparc64)_ZNSt6vectorIfSaIfEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPfS1_EEjRKf@Base 2.6.4
 (optional=templinst)_ZNSt6vectorIfSaIfEE15_M_range_insertIN9__gnu_cxx17__normal_iteratorIPfS1_EEEEvS6_T_S7_St20forward_iterator_tag@Base 2.6.7
 (optional=templinst)_ZNSt6vectorIfSaIfEE17_M_default_appendEm@Base 2.6.7.3
- (optional=templinst)_ZNSt6vectorIfSaIfEE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPfS1_EERKf@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIfSaIfEE17_M_realloc_insertIJRKfEEEvN9__gnu_cxx17__normal_iteratorIPfS1_EEDpOT_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIfSaIfEE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPfS1_EES5_@Base 2.5.2
 (optional=templinst)_ZNSt6vectorIfSaIfEEaSERKS1_@Base 2.6.7.3

--- a/debian/libimageclasses1.symbols
+++ b/debian/libimageclasses1.symbols
-# SymbolsHelper-Confirmed: 2.6.7.3 amd64
+# SymbolsHelper-Confirmed: 2.6.7.4 amd64
 libimageClasses.so.1 libimageclasses1 #MINVER#
 (optional=templinst)_Z15getGDALDataTypeIdE12GDALDataTypev@Base 2.6.7
 (optional=templinst)_Z15getGDALDataTypeIsE12GDALDataTypev@Base 2.6.7
@@ -134,19 +134,14 @@ libimageClasses.so.1 libimageclasses1 #MINVER#
 (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS5_S7_EE@Base 2.6.4
 (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EEaSERKS7_@Base 2.6.4
 (optional=templinst)_ZNSt6vectorIP12OGRFieldDefnSaIS1_EE17_M_default_appendEm@Base 2.6.7.3
- (optional=templinst)_ZNSt6vectorIPvSaIS0_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIPvSaIS0_EE17_M_realloc_insertIJS0_EEEvN9__gnu_cxx17__normal_iteratorIPS0_S2_EEDpOT_@Base 2.6.7.3
- (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIS_IfSaIfEESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIdSaIdEE15_M_range_insertIN9__gnu_cxx17__normal_iteratorIPdS1_EEEEvS6_T_S7_St20forward_iterator_tag@Base 2.6.4
 (optional=templinst)_ZNSt6vectorIdSaIdEE17_M_default_appendEm@Base 2.6.7.3
- (optional=templinst)_ZNSt6vectorIdSaIdEE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPdS1_EERKd@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIdSaIdEE17_M_realloc_insertIJRKdEEEvN9__gnu_cxx17__normal_iteratorIPdS1_EEDpOT_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIdSaIdEEaSERKS1_@Base 2.5.2
 (optional=templinst)_ZNSt6vectorIfSaIfEE12emplace_backIJfEEEvDpOT_@Base 2.6.7.3
- (optional=templinst)_ZNSt6vectorIfSaIfEE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPfS1_EERKf@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIfSaIfEE17_M_realloc_insertIJfEEEvN9__gnu_cxx17__normal_iteratorIPfS1_EEDpOT_@Base 2.6.7.3
- (optional=templinst)_ZNSt6vectorIiSaIiEE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPiS1_EERKi@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIiSaIiEE17_M_realloc_insertIJiEEEvN9__gnu_cxx17__normal_iteratorIPiS1_EEDpOT_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIsSaIsEE17_M_default_appendEm@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIsSaIsEE17_M_realloc_insertIJRKsEEEvN9__gnu_cxx17__normal_iteratorIPsS1_EEDpOT_@Base 2.6.7.3

--- a/debian/liblasclasses1.symbols
+++ b/debian/liblasclasses1.symbols
-# SymbolsHelper-Confirmed: 2.6.7.3 amd64
+# SymbolsHelper-Confirmed: 2.6.7.4 amd64
 liblasClasses.so.1 liblasclasses1 #MINVER#
 _ZN13FileReaderLas13readNextPointERN6liblas5PointE@Base 2.6.7
 _ZN13FileReaderLas14addClassFilterERKSt6vectorItSaItEE@Base 2.5.2
@@ -50,14 +50,11 @@ liblasClasses.so.1 liblasclasses1 #MINVER#
 _ZNK13FileReaderLas9getHeaderEv@Base 2.5.2
 _ZNK13FileReaderLas9las2asciiERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb@Base 2.6.4
 (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc@Base 2.5.2
- (optional=templinst)_ZNSt6vectorIN5boost10shared_ptrIN6liblas7FilterIEEESaIS4_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS4_S6_EERKS4_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIN5boost10shared_ptrIN6liblas7FilterIEEESaIS4_EE17_M_realloc_insertIJRKS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIN5boost10shared_ptrIN6liblas7FilterIEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIN5boost10shared_ptrIN6liblas7FilterIEEESaIS4_EED1Ev@Base 2.5.2
 (optional=templinst)_ZNSt6vectorIN5boost10shared_ptrIN6liblas7FilterIEEESaIS4_EED2Ev@Base 2.5.2
- (optional=templinst)_ZNSt6vectorIN6liblas14ClassificationESaIS1_EE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorIN6liblas14ClassificationESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 2.6.7.3
- (optional=templinst)_ZNSt6vectorItSaItEE17_M_realloc_insertEN9__gnu_cxx17__normal_iteratorIPtS1_EERKt@Base 2.6.7.3
 (optional=templinst)_ZNSt6vectorItSaItEE17_M_realloc_insertIJRKtEEEvN9__gnu_cxx17__normal_iteratorIPtS1_EEDpOT_@Base 2.6.7.3
 _ZTI16LastReturnFilter@Base 2.5.2
 _ZTIN5boost6detail15sp_counted_baseE@Base 2.5.2

--- a/debian/patches/gdal-c++11.patch
+++ b/debian/patches/gdal-c++11.patch
-Description: Use C++11 for compatibility with GDAL 2.3.0.
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://savannah.nongnu.org/bugs/index.php?53725
-
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -166,7 +166,7 @@ else()
- 
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ${PKTOOLS_COMMON_CXX_FLAGS}")
-     if (CMAKE_COMPILER_IS_GNUCXX)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
-+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-     endif()
- 
-   elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER}" MATCHES "clang")
--- a/debian/patches/series
+++ b/debian/patches/series
 spelling-errors2.patch
 multiarch.patch
-gdal-c++11.patch
--- a/src/apps/pkdiff.cc
+++ b/src/apps/pkdiff.cc
@@ -288,11 +288,18 @@ int main(int argc, char *argv[])
  ImgReaderOgr referenceReaderOgr;
  try{
    referenceReaderOgr.open(reference_opt[0]);
+    double ulx,uly,lrx,lry;
+    if(!referenceReaderOgr.getExtent(ulx,uly,lrx,lry))
+      throw(std::string("Input is raster"));
    referenceReaderOgr.close();
+    if(verbose_opt[0])
+      std::cout << "reference is vector dataset" << std::endl;
  }
  catch(string errorString){
    //todo: sampleIsRaster will not work from GDAL 2.0!!?? (unification of driver for raster and vector datasets)
    refIsRaster=true;
+    if(verbose_opt[0])
+      std::cout << "reference is raster dataset" << std::endl;
  }
  const char* pszMessage;
  void* pProgressArg=NULL;