[gdal] 06/12: Drop patches applied upstream. Refresh remaining patches.
Bas Couwenberg
sebastic at debian.org
Fri Apr 14 15:12:39 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental-2.2
in repository gdal.
commit 2afeaf8c2a3480e8b8e4a4d5e0d9c5f01d4392f4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Apr 14 11:35:02 2017 +0200
Drop patches applied upstream. Refresh remaining patches.
---
debian/changelog | 1 +
debian/patches/gdalpaths | 8 +-
debian/patches/hdf4 | 10 +-
debian/patches/ogdi | 2 +-
debian/patches/perl-vendor | 2 +-
debian/patches/privacy-breach-logo.patch | 17 +--
debian/patches/python3-import-gdal_array.patch | 28 ----
debian/patches/series | 3 -
debian/patches/sort-files-in-static-library.patch | 17 ---
debian/patches/spatialite | 6 +-
debian/patches/spelling-errors.patch | 161 ----------------------
11 files changed, 18 insertions(+), 237 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ab47187..8a168ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gdal (2.2.0~beta1+dfsg-1) UNRELEASED; urgency=medium
* New upstream beta release.
* Update watch file for 2.2.0 (pre-)releases.
+ * Drop patches applied upstream. Refresh remaining patches.
-- Bas Couwenberg <sebastic at debian.org> Fri, 14 Apr 2017 11:25:30 +0200
diff --git a/debian/patches/gdalpaths b/debian/patches/gdalpaths
index cf2e0cb..489d6fc 100644
--- a/debian/patches/gdalpaths
+++ b/debian/patches/gdalpaths
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/gcore/gdaldrivermanager.cpp
+++ b/gcore/gdaldrivermanager.cpp
-@@ -705,7 +705,7 @@ void GDALDriverManager::AutoLoadDrivers(
+@@ -740,7 +740,7 @@ void GDALDriverManager::AutoLoadDrivers(
#ifdef MACOSX_FRAMEWORK
GDAL_PREFIX "/PlugIns");
#else
@@ -16,12 +16,12 @@ Forwarded: not-needed
char szExecPath[1024];
--- a/port/cpl_findfile.cpp
+++ b/port/cpl_findfile.cpp
-@@ -113,7 +113,7 @@ static FindFileTLS* CPLFinderInit()
+@@ -118,7 +118,7 @@ static FindFileTLS* CPLFinderInit()
#ifdef MACOSX_FRAMEWORK
CPLPushFinderLocation( GDAL_PREFIX "/Resources/gdal" );
#else
- CPLPushFinderLocation( GDAL_PREFIX "/share/gdal" );
+ CPLPushFinderLocation( GDAL_PREFIX "/share/gdal/2.2" );
#endif
- #else
- CPLPushFinderLocation( "/usr/local/share/gdal" );
+ #endif
+ }
diff --git a/debian/patches/hdf4 b/debian/patches/hdf4
index fc5a85e..784dd05 100644
--- a/debian/patches/hdf4
+++ b/debian/patches/hdf4
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/configure
+++ b/configure
-@@ -22501,7 +22501,7 @@ fi
+@@ -23680,7 +23680,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
-@@ -22561,7 +22561,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
+@@ -23740,7 +23740,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. */
-@@ -22592,7 +22592,7 @@ fi
+@@ -23771,7 +23771,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
-@@ -22607,7 +22607,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
+@@ -23786,7 +23786,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. */
-@@ -22638,7 +22638,7 @@ fi
+@@ -23817,7 +23817,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/ogdi b/debian/patches/ogdi
index 989ac65..066bf3f 100644
--- a/debian/patches/ogdi
+++ b/debian/patches/ogdi
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/GDALmake.opt.in
+++ b/GDALmake.opt.in
-@@ -430,7 +430,7 @@ endif
+@@ -422,7 +422,7 @@ endif
# PCRaster support
PCRASTER_SETTING = @PCRASTER_SETTING@
diff --git a/debian/patches/perl-vendor b/debian/patches/perl-vendor
index 51cd388..a0bc27d 100644
--- a/debian/patches/perl-vendor
+++ b/debian/patches/perl-vendor
@@ -17,7 +17,7 @@ Last-Update: 2014-07-08
$(MAKE) -f Makefile_Geo__GDAL test
--- a/swig/perl/GNUmakefile
+++ b/swig/perl/GNUmakefile
-@@ -28,7 +28,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL
+@@ -30,7 +30,7 @@ build: gdal_wrap.cc Makefile_Geo__GDAL
gdal_wrap.cc: generate
Makefile_Geo__GDAL:
diff --git a/debian/patches/privacy-breach-logo.patch b/debian/patches/privacy-breach-logo.patch
index 28a0559..76f335c 100644
--- a/debian/patches/privacy-breach-logo.patch
+++ b/debian/patches/privacy-breach-logo.patch
@@ -2,25 +2,14 @@ Description: Don't embedded external logo images.
Author: Bas Couwenberg <sebastic at debian.org>
Forwarded: not-needed
---- a/doc/index.dox
-+++ b/doc/index.dox
-@@ -113,7 +113,7 @@ or <a href="http://home.gdal.org/project
- <table border="0" cellspacing="4" cellpadding="4">
-
- <tr><td><a href="http://2016.foss4g.org/">
--<img src="http://wiki.osgeo.org/images/f/ff/Foss4g2016_logo_squared.png" alt="FOSS4G 2016" border="0">
-+FOSS4G 2016
- </a></td>
-
- <td><a href="http://2016.foss4g.org">FOSS4G 2016</a> is the leading annual
--- a/doc/ru/index_ru.dox
+++ b/doc/ru/index_ru.dox
@@ -123,7 +123,7 @@ or <a href="http://home.gdal.org/project
<table border="0" cellspacing="4" cellpadding="4">
- <tr><td><a href="http://2016.foss4g.org/">
--<img src="http://wiki.osgeo.org/images/f/ff/Foss4g2016_logo_squared.png" alt="FOSS4G 2016" border="0">
+ <tr><td><a href="http://2016.foss4g.org/">
+-<img src="http://wiki.osgeo.org/images/f/ff/Foss4g2016_logo_squared.png" alt="FOSS4G 2016" border="0">
+FOSS4G 2016
- </a></td>
+ </a></td>
<td><a href="http://2016.foss4g.org">FOSS4G 2016</a> основная ежегодная
diff --git a/debian/patches/python3-import-gdal_array.patch b/debian/patches/python3-import-gdal_array.patch
deleted file mode 100644
index f3f901f..0000000
--- a/debian/patches/python3-import-gdal_array.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Python bindings: fix 'import osgeo.gdal_array' with python3 and SWIG 3.0.10
-Author: Even Rouault
-Origin: https://trac.osgeo.org/gdal/changeset/37277
-Bug: https://trac.osgeo.org/gdal/ticket/6801
-Bug-Debian: https://bugs.debian.org/853900
-
---- a/swig/include/gdal_array.i
-+++ b/swig/include/gdal_array.i
-@@ -994,7 +994,7 @@ retStringAndCPLFree* GetArrayFilename(Py
-
- %pythoncode %{
- import numpy
--import _gdal_array
-+from . import _gdal_array
-
- import gdalconst
- import gdal
---- a/swig/python/osgeo/gdal_array.py
-+++ b/swig/python/osgeo/gdal_array.py
-@@ -145,7 +145,7 @@ def RATValuesIONumPyRead(*args, **kwargs
- return _gdal_array.RATValuesIONumPyRead(*args, **kwargs)
- RATValuesIONumPyRead = _gdal_array.RATValuesIONumPyRead
- import numpy
--import _gdal_array
-+from . import _gdal_array
-
- import gdalconst
- import gdal
diff --git a/debian/patches/series b/debian/patches/series
index d3015bc..4a9b77a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,3 @@ spatialite
java.opt
perl-vendor
privacy-breach-logo.patch
-sort-files-in-static-library.patch
-spelling-errors.patch
-python3-import-gdal_array.patch
diff --git a/debian/patches/sort-files-in-static-library.patch b/debian/patches/sort-files-in-static-library.patch
deleted file mode 100644
index 02d7886..0000000
--- a/debian/patches/sort-files-in-static-library.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Sort files passed as arguments to make the build reproducible.
-Author: Alexis Bienvenüe <pado at passoire.fr>
-Bug-Debian: https://bugs.debian.org/824808
-Forwarded: https://trac.osgeo.org/gdal/ticket/6520
-Applied-Upstream: 2.2.0, https://trac.osgeo.org/gdal/changeset/34257
-
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -53,7 +53,7 @@ $(GDAL_SLIB): $(GDAL_OBJ) $(GDAL_LIB)
- -o $(GDAL_SLIB)
-
- $(LIBGDAL): $(GDAL_OBJ:.o=.lo)
-- $(LD) $(LDFLAGS) $(LIBS) -o $@ $(GDAL_OBJ:.o=.lo) \
-+ $(LD) $(LDFLAGS) $(LIBS) -o $@ $(sort $(wildcard $(GDAL_OBJ:.o=.lo))) \
- -rpath $(INST_LIB) \
- -no-undefined \
- -version-info $(LIBGDAL_CURRENT):$(LIBGDAL_REVISION):$(LIBGDAL_AGE)
diff --git a/debian/patches/spatialite b/debian/patches/spatialite
index 3ec3eb2..c66cd02 100644
--- a/debian/patches/spatialite
+++ b/debian/patches/spatialite
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/configure
+++ b/configure
-@@ -27175,7 +27175,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -28799,7 +28799,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. */
-@@ -27239,7 +27239,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -28863,7 +28863,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. */
-@@ -27629,7 +27629,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar
+@@ -29253,7 +29253,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/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index f2ac1ec..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-Description: Fix spelling errors.
- Reseting -> Resetting
- Overlaping -> Overlapping
- Collumn -> Column
- Deleteing -> Deleting
- repsonse -> response
- occured -> occurred
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: not-needed
-
---- a/ogr/ogrfielddefn.cpp
-+++ b/ogr/ogrfielddefn.cpp
-@@ -280,7 +280,7 @@ void OGRFieldDefn::SetType( OGRFieldType
- if( !OGR_AreTypeSubTypeCompatible(eTypeIn, eSubType) )
- {
- CPLError(CE_Warning, CPLE_AppDefined,
-- "Type and subtype of field definition are not compatible. Reseting to OFSTNone");
-+ "Type and subtype of field definition are not compatible. Resetting to OFSTNone");
- eSubType = OFSTNone;
- }
- eType = eTypeIn;
-@@ -366,7 +366,7 @@ void OGRFieldDefn::SetSubType( OGRFieldS
- if( !OGR_AreTypeSubTypeCompatible(eType, eSubTypeIn) )
- {
- CPLError(CE_Warning, CPLE_AppDefined,
-- "Type and subtype of field definition are not compatible. Reseting to OFSTNone");
-+ "Type and subtype of field definition are not compatible. Resetting to OFSTNone");
- eSubType = OFSTNone;
- }
- else
---- a/ogr/ogrsf_frmts/plscenes/ogrplscenesdataset.cpp
-+++ b/ogr/ogrsf_frmts/plscenes/ogrplscenesdataset.cpp
-@@ -444,7 +444,7 @@ GDALDataset* OGRPLScenesDataset::OpenRas
-
- CPLErrorReset();
- poOutDS->SetDescription(poOpenInfo->pszFilename);
-- CSLDestroy(poOutDS->GetFileList()); /* so as to probe all auxiliary files before reseting the allowed extensions */
-+ CSLDestroy(poOutDS->GetFileList()); /* so as to probe all auxiliary files before resetting the allowed extensions */
- }
-
- if( bUseVSICURL )
---- a/ogr/ogrsf_frmts/plscenes/ogrplscenesv1dataset.cpp
-+++ b/ogr/ogrsf_frmts/plscenes/ogrplscenesv1dataset.cpp
-@@ -651,7 +651,7 @@ retry:
-
- CPLErrorReset();
- poOutDS->SetDescription(poOpenInfo->pszFilename);
-- CSLDestroy(poOutDS->GetFileList()); /* so as to probe all auxiliary files before reseting the allowed extensions */
-+ CSLDestroy(poOutDS->GetFileList()); /* so as to probe all auxiliary files before resetting the allowed extensions */
- }
- else if( CPLGetLastErrorType() == CE_None )
- {
---- a/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp
-+++ b/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp
-@@ -496,7 +496,7 @@ OGRErr OGRWAsPLayer::WriteRoughness( OGR
- OGREnvelope oErrorRegion = oZones[i].oEnvelope;
- oErrorRegion.Intersect( oEnvelope );
- CPLError(CE_Failure, CPLE_NotSupported,
-- "Overlaping polygons in rectangle (%.16g %.16g, %.16g %.16g))",
-+ "Overlapping polygons in rectangle (%.16g %.16g, %.16g %.16g))",
- oErrorRegion.MinX,
- oErrorRegion.MinY,
- oErrorRegion.MaxX,
-@@ -516,7 +516,7 @@ OGRErr OGRWAsPLayer::WriteRoughness( OGR
- OGREnvelope oErrorRegion = oZones[i].oEnvelope;
- oErrorRegion.Intersect( oEnvelope );
- CPLError(CE_Failure, CPLE_NotSupported,
-- "Overlaping polygons in rectangle (%.16g %.16g, %.16g %.16g))",
-+ "Overlapping polygons in rectangle (%.16g %.16g, %.16g %.16g))",
- oErrorRegion.MinX,
- oErrorRegion.MinY,
- oErrorRegion.MaxX,
---- a/frmts/pcraster/libcsf/mperror.c
-+++ b/frmts/pcraster/libcsf/mperror.c
-@@ -12,7 +12,7 @@ static const char * const errolist[ERROR
- "Illegal cell representation constant",
- "Access denied",
- "Row number to big",
--"Collumn number to big",
-+"Column number to big",
- "Map is not a raster file",
- "Illegal conversion",
- "No space on device to write",
---- a/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp
-+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp
-@@ -2070,7 +2070,7 @@ OGRErr OGRLIBKMLDataSource::DeleteLayer
- if ( !VSIStatL ( pszFilePath, &oStatBufL ) ) {
- if ( VSIUnlink ( pszFilePath ) ) {
- CPLError ( CE_Failure, CPLE_AppDefined,
-- "ERROR Deleteing Layer %s from filesystem as %s",
-+ "ERROR Deleting Layer %s from filesystem as %s",
- papoLayers[iLayer]->GetName ( ), pszFilePath );
- }
- }
---- a/port/cpl_aws.cpp
-+++ b/port/cpl_aws.cpp
-@@ -525,7 +525,7 @@ bool VSIS3HandleHelper::CanRestartOnErro
- CPLXMLNode* psTree = CPLParseXMLString(pszErrorMsg);
- if( psTree == NULL )
- {
-- if(bSetError) { VSIError(VSIE_AWSError, "Malformed AWS XML repsonse: %s", pszErrorMsg); }
-+ if(bSetError) { VSIError(VSIE_AWSError, "Malformed AWS XML response: %s", pszErrorMsg); }
- return false;
- }
-
-@@ -533,7 +533,7 @@ bool VSIS3HandleHelper::CanRestartOnErro
- if( pszCode == NULL )
- {
- CPLDestroyXMLNode(psTree);
-- if(bSetError) { VSIError(VSIE_AWSError, "Malformed AWS XML repsonse: %s", pszErrorMsg); }
-+ if(bSetError) { VSIError(VSIE_AWSError, "Malformed AWS XML response: %s", pszErrorMsg); }
- return false;
- }
-
-@@ -543,7 +543,7 @@ bool VSIS3HandleHelper::CanRestartOnErro
- if( pszRegion == NULL )
- {
- CPLDestroyXMLNode(psTree);
-- if(bSetError) { VSIError(VSIE_AWSError, "Malformed AWS XML repsonse: %s", pszErrorMsg); }
-+ if(bSetError) { VSIError(VSIE_AWSError, "Malformed AWS XML response: %s", pszErrorMsg); }
- return false;
- }
- SetAWSRegion(pszRegion);
-@@ -560,7 +560,7 @@ bool VSIS3HandleHelper::CanRestartOnErro
- pszEndpoint[m_osBucket.size()] != '.')) )
- {
- CPLDestroyXMLNode(psTree);
-- if(bSetError) { VSIError(VSIE_AWSError, "Malformed AWS XML repsonse: %s", pszErrorMsg); }
-+ if(bSetError) { VSIError(VSIE_AWSError, "Malformed AWS XML response: %s", pszErrorMsg); }
- return false;
- }
- if( !m_bUseVirtualHosting &&
---- a/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
-+++ b/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
-@@ -2706,7 +2706,7 @@ OGRErr OGRShapeLayer::Repack()
- if( !CopyInPlace( VSI_SHP_GetVSIL(hDBF->fp), oTempFileDBF ) )
- {
- CPLError( CE_Failure, CPLE_FileIO,
-- "An error occured while copying the content of %s on top of %s. "
-+ "An error occurred while copying the content of %s on top of %s. "
- "The non corrupted version is in the _packed.dbf, "
- "_packed.shp and _packed.shx files that you should rename "
- "on top of the main ones.",
-@@ -2735,7 +2735,7 @@ OGRErr OGRShapeLayer::Repack()
- if( !CopyInPlace( VSI_SHP_GetVSIL(hSHP->fpSHP), oTempFileSHP ) )
- {
- CPLError( CE_Failure, CPLE_FileIO,
-- "An error occured while copying the content of %s on top of %s. "
-+ "An error occurred while copying the content of %s on top of %s. "
- "The non corrupted version is in the _packed.dbf, "
- "_packed.shp and _packed.shx files that you should rename "
- "on top of the main ones.",
-@@ -2757,7 +2757,7 @@ OGRErr OGRShapeLayer::Repack()
- if( !CopyInPlace( VSI_SHP_GetVSIL(hSHP->fpSHX), oTempFileSHX ) )
- {
- CPLError( CE_Failure, CPLE_FileIO,
-- "An error occured while copying the content of %s on top of %s. "
-+ "An error occurred while copying the content of %s on top of %s. "
- "The non corrupted version is in the _packed.dbf, "
- "_packed.shp and _packed.shx files that you should rename "
- "on top of the main ones.",
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git
More information about the Pkg-grass-devel
mailing list