This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental-2.1 in repository gdal.
commit 60ec6732fccdbdb61058c3ba2845512d94724b87 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Jan 20 10:31:41 2017 +0100 Drop svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch, included upstream. Refresh remaining patches. --- debian/changelog | 2 ++ debian/patches/hdf4 | 10 ++++---- debian/patches/series | 1 - debian/patches/spatialite | 6 ++--- ...ix-crash-on-URL-that-are-not-DODS-servers.patch | 30 ---------------------- 5 files changed, 10 insertions(+), 39 deletions(-) diff --git a/debian/changelog b/debian/changelog index 336b33d..f79ff8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ gdal (2.1.3~rc1+dfsg-1) UNRELEASED; urgency=medium * New upstream release candidate. * Update watch file for 2.1.3 (pre-)releases. + * Drop svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch, + included upstream. Refresh remaining patches. -- Bas Couwenberg <sebas...@debian.org> Fri, 20 Jan 2017 10:21:56 +0100 diff --git a/debian/patches/hdf4 b/debian/patches/hdf4 index c196989..fc5a85e 100644 --- a/debian/patches/hdf4 +++ b/debian/patches/hdf4 @@ -5,7 +5,7 @@ Forwarded: not-needed --- a/configure +++ b/configure -@@ -22478,7 +22478,7 @@ fi +@@ -22501,7 +22501,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mfhdf_SDreaddata" >&5 $as_echo "$ac_cv_lib_mfhdf_SDreaddata" >&6; } if test "x$ac_cv_lib_mfhdf_SDreaddata" = xyes; then : @@ -14,7 +14,7 @@ Forwarded: not-needed else HDF_LIB_NAME=missing fi -@@ -22538,7 +22538,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false +@@ -22561,7 +22561,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23,7 +23,7 @@ Forwarded: not-needed cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -22569,7 +22569,7 @@ fi +@@ -22592,7 +22592,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mfhdf_SDreaddata" >&5 $as_echo "$ac_cv_lib_mfhdf_SDreaddata" >&6; } if test "x$ac_cv_lib_mfhdf_SDreaddata" = xyes; then : @@ -32,7 +32,7 @@ Forwarded: not-needed else HDF_LIB_NAME=missing fi -@@ -22584,7 +22584,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false +@@ -22607,7 +22607,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -41,7 +41,7 @@ Forwarded: not-needed cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -22615,7 +22615,7 @@ fi +@@ -22638,7 +22638,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mfhdf_SDreaddata" >&5 $as_echo "$ac_cv_lib_mfhdf_SDreaddata" >&6; } if test "x$ac_cv_lib_mfhdf_SDreaddata" = xyes; then : diff --git a/debian/patches/series b/debian/patches/series index aeefe2e..d0d5927 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,4 +10,3 @@ perl-vendor privacy-breach-logo.patch sort-files-in-static-library.patch spelling-errors.patch -svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch diff --git a/debian/patches/spatialite b/debian/patches/spatialite index 01c5c75..3ec3eb2 100644 --- a/debian/patches/spatialite +++ b/debian/patches/spatialite @@ -5,7 +5,7 @@ Forwarded: not-needed --- a/configure +++ b/configure -@@ -27152,7 +27152,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini +@@ -27175,7 +27175,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14,7 +14,7 @@ Forwarded: not-needed cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -27216,7 +27216,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini +@@ -27239,7 +27239,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -23,7 +23,7 @@ Forwarded: not-needed cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -27606,7 +27606,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar +@@ -27629,7 +27629,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS diff --git a/debian/patches/svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch b/debian/patches/svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch deleted file mode 100644 index e3b1ce1..0000000 --- a/debian/patches/svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: DODS: fix crash on URL that are not DODS servers -Author: Even Rouault <even dot rouault at spatialys dot com> -Origin: https://trac.osgeo.org/gdal/changeset/36175 -Bug: https://trac.osgeo.org/gdal/ticket/6718 -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdal/+bug/1640360 - ---- a/frmts/dods/dodsdataset2.cpp -+++ b/frmts/dods/dodsdataset2.cpp -@@ -496,6 +496,8 @@ char **DODSDataset::CollectBandsFromDDSV - /* -------------------------------------------------------------------- */ - BaseType *poVar = get_variable( GetDDS(), oVarName ); - -+ if( poVar == NULL ) -+ return papszResultList; - if( poVar->type() == dods_array_c ) - { - poGrid = NULL; -@@ -1024,7 +1026,11 @@ DODSDataset::Open(GDALOpenInfo *poOpenIn - /* Did we get any target variables? */ - /* -------------------------------------------------------------------- */ - if( CSLCount(papszVarConstraintList) == 0 ) -- throw Error( "No apparent raster grids or arrays found in DDS."); -+ { -+ CPLDebug( "DODS", "No apparent raster grids or arrays found in DDS."); -+ delete poDS; -+ return NULL; -+ } - - /* -------------------------------------------------------------------- */ - /* For now we support only a single band. */ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel