[gdal] 06/08: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Fri Oct 14 17:09:16 UTC 2016
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 81f8ac5e62bc3080f4dd6047d79a864a0dba805c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Oct 14 14:01:46 2016 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/gdalpaths | 2 +-
debian/patches/spelling-errors.patch | 15 ++-------------
3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2c1f034..781f1af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
gdal (2.1.2~rc1+dfsg-1) UNRELEASED; urgency=medium
* New upstream release candidate.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Fri, 14 Oct 2016 13:53:57 +0200
diff --git a/debian/patches/gdalpaths b/debian/patches/gdalpaths
index a65651b..d22f118 100644
--- a/debian/patches/gdalpaths
+++ b/debian/patches/gdalpaths
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/gcore/gdaldrivermanager.cpp
+++ b/gcore/gdaldrivermanager.cpp
-@@ -701,7 +701,7 @@ void GDALDriverManager::AutoLoadDrivers(
+@@ -705,7 +705,7 @@ void GDALDriverManager::AutoLoadDrivers(
#ifdef MACOSX_FRAMEWORK
GDAL_PREFIX "/PlugIns");
#else
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
index ebeb4db..922c26e 100644
--- a/debian/patches/spelling-errors.patch
+++ b/debian/patches/spelling-errors.patch
@@ -7,17 +7,6 @@ Description: Fix spelling errors.
Author: Bas Couwenberg <sebastic at debian.org>
Forwarded: not-needed
---- a/NEWS
-+++ b/NEWS
-@@ -776,7 +776,7 @@ PG driver:
- * Add PRELUDE_STATEMENTS and CLOSING_STATEMENTS open option to be for example able to specify options, like statement_timeout, with pg_bouncer
- * Fix 2.0 regression when overwriting several existing PostGIS layers with ogr2ogr (#6018)
- * Update PG, PGDump and CartoDB drivers to correctly export POINT EMPTY for PostGIS 2.2
-- * avoid reseting error potentially emitted by ExecuteSQL() (#6194)
-+ * avoid resetting error potentially emitted by ExecuteSQL() (#6194)
- * sanitize management of quoting for FID column at layer creation
- * fix to get SRID on result layer with PostGIS 2.2
- * in copy mode (the default on layer creation), do not truncate the concatenated string list to the field width (#6356)
--- a/ogr/ogrfielddefn.cpp
+++ b/ogr/ogrfielddefn.cpp
@@ -280,7 +280,7 @@ void OGRFieldDefn::SetType( OGRFieldType
@@ -40,7 +29,7 @@ Forwarded: not-needed
else
--- a/ogr/ogrsf_frmts/plscenes/ogrplscenesdataset.cpp
+++ b/ogr/ogrsf_frmts/plscenes/ogrplscenesdataset.cpp
-@@ -441,7 +441,7 @@ GDALDataset* OGRPLScenesDataset::OpenRas
+@@ -442,7 +442,7 @@ GDALDataset* OGRPLScenesDataset::OpenRas
CPLErrorReset();
poOutDS->SetDescription(poOpenInfo->pszFilename);
@@ -51,7 +40,7 @@ Forwarded: not-needed
if( bUseVSICURL )
--- a/ogr/ogrsf_frmts/plscenes/ogrplscenesv1dataset.cpp
+++ b/ogr/ogrsf_frmts/plscenes/ogrplscenesv1dataset.cpp
-@@ -652,7 +652,7 @@ retry:
+@@ -653,7 +653,7 @@ retry:
CPLErrorReset();
poOutDS->SetDescription(poOpenInfo->pszFilename);
--
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