[gdal] 06/10: Drop patches included upstream. Refresh remaining patches.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository gdal.

commit b9481990e00832749ab9698389af1c81160e583a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Mar 19 15:33:30 2018 +0100

    Drop patches included upstream. Refresh remaining patches.
---
 debian/changelog                                   |  1 +
 debian/patches/perl-doxyfile                       |  4 ++--
 debian/patches/series                              |  1 -
 debian/patches/spatialite                          |  6 ++---
 ...potential-issue-with-CPL-circular-buffers.patch | 28 ----------------------
 5 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8023e5..22085ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gdal (2.2.4~rc1+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
   * Update watch file for 2.2.4 (pre-)releases.
+  * Drop patches included upstream. Refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 19 Mar 2018 15:28:56 +0100
 
diff --git a/debian/patches/perl-doxyfile b/debian/patches/perl-doxyfile
index 019835d..91615ad 100644
--- a/debian/patches/perl-doxyfile
+++ b/debian/patches/perl-doxyfile
@@ -3,8 +3,8 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
 Last-Update: 2018-01-02
 Forwarded: https://github.com/ajolma/Geo-GDAL-2.02/pull/1
 
---- gdal.orig/swig/perl/Doxyfile
-+++ gdal/swig/perl/Doxyfile
+--- a/swig/perl/Doxyfile
++++ b/swig/perl/Doxyfile
 @@ -280,7 +280,7 @@ OPTIMIZE_OUTPUT_VHDL   = NO
  # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
  # the files are not read by doxygen.
diff --git a/debian/patches/series b/debian/patches/series
index 6aa3d93..c574f26 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,5 +10,4 @@ perl-vendor
 privacy-breach-logo.patch
 privacy-breach-generic.patch
 perl-doxyfile
-svn-r41303_gnm-avoid-potential-issue-with-CPL-circular-buffers.patch
 spelling-errors.patch
diff --git a/debian/patches/spatialite b/debian/patches/spatialite
index 7974994..d8c5bc5 100644
--- a/debian/patches/spatialite
+++ b/debian/patches/spatialite
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/configure
 +++ b/configure
-@@ -28977,7 +28977,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -29020,7 +29020,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.  */
  
-@@ -29041,7 +29041,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -29084,7 +29084,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.  */
  
-@@ -29431,7 +29431,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar
+@@ -29474,7 +29474,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-r41303_gnm-avoid-potential-issue-with-CPL-circular-buffers.patch b/debian/patches/svn-r41303_gnm-avoid-potential-issue-with-CPL-circular-buffers.patch
deleted file mode 100644
index fe228d2..0000000
--- a/debian/patches/svn-r41303_gnm-avoid-potential-issue-with-CPL-circular-buffers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: GNM: avoid potential issue with CPL circular buffers (can happen if there are extra drivers that use CPLGet....() functions)
-Author: Even Rouault <even dot rouault at spatialys dot com>
-Origin: https://trac.osgeo.org/gdal/changeset/41303/
-
---- a/gnm/gnm_frmts/file/gnmfilenetwork.cpp
-+++ b/gnm/gnm_frmts/file/gnmfilenetwork.cpp
-@@ -101,10 +101,10 @@ CPLErr GNMFileNetwork::Open(GDALOpenInfo
-     }
- 
-     m_poLayerDriver = m_pMetadataDS->GetDriver();
--    const char* pszExt = CPLGetExtension(soMetadatafile);
-+    CPLString osExt = CPLGetExtension(soMetadatafile);
- 
-     CPLString soGraphfile = CPLFormFilename(m_soNetworkFullName,
--                                            GNM_SYSLAYER_GRAPH, pszExt);
-+                                            GNM_SYSLAYER_GRAPH, osExt);
-     m_pGraphDS = (GDALDataset*) GDALOpenEx( soGraphfile, GDAL_OF_VECTOR |
-                                             GDAL_OF_UPDATE, NULL, NULL, NULL );
-     if( NULL == m_pGraphDS )
-@@ -120,7 +120,7 @@ CPLErr GNMFileNetwork::Open(GDALOpenInfo
-     }
- 
-     CPLString soFeaturesfile = CPLFormFilename(m_soNetworkFullName,
--                                            GNM_SYSLAYER_FEATURES, pszExt);
-+                                            GNM_SYSLAYER_FEATURES, osExt);
-     m_pFeaturesDS = (GDALDataset*) GDALOpenEx( soFeaturesfile, GDAL_OF_VECTOR |
-                                                GDAL_OF_UPDATE, NULL, NULL, NULL );
-     if( NULL == m_pFeaturesDS )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git