[gdal] 05/05: Drop patches applied upstream, refresh remaining patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Wed Sep 16 21:03:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental-2.0
in repository gdal.
commit b648a40f3d26fe0584ff14b50790433fea856075
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Sep 16 21:52:13 2015 +0200
Drop patches applied upstream, refresh remaining patches.
---
debian/changelog | 1 -
debian/patches/existant-typo | 111 ------------------------------------------
debian/patches/hardening | 39 ---------------
debian/patches/initalize-typo | 25 ----------
debian/patches/series | 3 --
5 files changed, 179 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2d7c463..7440dfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,6 @@ gdal (2.0.1~rc1+dfsg-1) UNRELEASED; urgency=medium
Breaks/Replaces.
* Change virtual package from libgdal.so.1-<major>.<minor>.<patch> format
to gdal-abi-<major>-<minor>-<patch> format.
- * Add patch to fix 'existent' typo.
-- Bas Couwenberg <sebastic at debian.org> Wed, 16 Sep 2015 21:41:45 +0200
diff --git a/debian/patches/existant-typo b/debian/patches/existant-typo
deleted file mode 100644
index e7d5e0c..0000000
--- a/debian/patches/existant-typo
+++ /dev/null
@@ -1,111 +0,0 @@
-Description: Fix 'existant' typo, replace with 'existent'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/gdal/ticket/6074
-
---- a/frmts/envisat/EnvisatFile.c
-+++ b/frmts/envisat/EnvisatFile.c
-@@ -1387,7 +1387,7 @@ int EnvisatFile_ReadDatasetChunk( Envisa
- {
- if( ds_index < 0 || ds_index >= self->ds_count )
- {
-- SendError( "Attempt to read non-existant dataset in "
-+ SendError( "Attempt to read non-existent dataset in "
- "EnvisatFile_ReadDatasetChunk()" );
- return FAILURE;
- }
-@@ -1452,7 +1452,7 @@ int EnvisatFile_WriteDatasetRecord( Envi
-
- if( ds_index < 0 || ds_index >= self->ds_count )
- {
-- SendError( "Attempt to write non-existant dataset in "
-+ SendError( "Attempt to write non-existent dataset in "
- "EnvisatFile_WriteDatasetRecord()" );
- return FAILURE;
- }
-@@ -1569,7 +1569,7 @@ int EnvisatFile_ReadDatasetRecordChunk(
-
- if( ds_index < 0 || ds_index >= self->ds_count )
- {
-- SendError( "Attempt to read non-existant dataset in "
-+ SendError( "Attempt to read non-existent dataset in "
- "EnvisatFile_ReadDatasetRecordChunk()" );
- return FAILURE;
- }
---- a/frmts/pcidsk/sdk/channel/cpcidskchannel.cpp
-+++ b/frmts/pcidsk/sdk/channel/cpcidskchannel.cpp
-@@ -200,7 +200,7 @@ PCIDSKChannel *CPCIDSKChannel::GetOvervi
- EstablishOverviewInfo();
-
- if( overview_index < 0 || overview_index >= (int) overview_infos.size() )
-- ThrowPCIDSKException( "Non existant overview (%d) requested.",
-+ ThrowPCIDSKException( "Non existent overview (%d) requested.",
- overview_index );
-
- if( overview_bands[overview_index] == NULL )
-@@ -231,7 +231,7 @@ bool CPCIDSKChannel::IsOverviewValid( in
- EstablishOverviewInfo();
-
- if( overview_index < 0 || overview_index >= (int) overview_infos.size() )
-- ThrowPCIDSKException( "Non existant overview (%d) requested.",
-+ ThrowPCIDSKException( "Non existent overview (%d) requested.",
- overview_index );
-
- int sis_id, validity=0;
-@@ -252,7 +252,7 @@ std::string CPCIDSKChannel::GetOverviewR
- EstablishOverviewInfo();
-
- if( overview_index < 0 || overview_index >= (int) overview_infos.size() )
-- ThrowPCIDSKException( "Non existant overview (%d) requested.",
-+ ThrowPCIDSKException( "Non existent overview (%d) requested.",
- overview_index );
-
- int sis_id, validity=0;
-@@ -275,7 +275,7 @@ void CPCIDSKChannel::SetOverviewValidity
- EstablishOverviewInfo();
-
- if( overview_index < 0 || overview_index >= (int) overview_infos.size() )
-- ThrowPCIDSKException( "Non existant overview (%d) requested.",
-+ ThrowPCIDSKException( "Non existent overview (%d) requested.",
- overview_index );
-
- int sis_id, validity=0;
---- a/frmts/pcidsk/sdk/channel/ctiledchannel.cpp
-+++ b/frmts/pcidsk/sdk/channel/ctiledchannel.cpp
-@@ -358,7 +358,7 @@ int CTiledChannel::ReadBlock( int block_
-
- if( block_index < 0 || block_index >= tile_count )
- {
-- ThrowPCIDSKException( "Requested non-existant block (%d)",
-+ ThrowPCIDSKException( "Requested non-existent block (%d)",
- block_index );
- }
-
-@@ -516,7 +516,7 @@ int CTiledChannel::WriteBlock( int block
-
- if( block_index < 0 || block_index >= tile_count )
- {
-- ThrowPCIDSKException( "Requested non-existant block (%d)",
-+ ThrowPCIDSKException( "Requested non-existent block (%d)",
- block_index );
- }
-
---- a/frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp
-+++ b/frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp
-@@ -238,7 +238,7 @@ int CPCIDSKBitmap::ReadBlock( int block_
-
- if( block_index < 0 || block_index >= GetBlockCount() )
- {
-- ThrowPCIDSKException( "Requested non-existant block (%d)",
-+ ThrowPCIDSKException( "Requested non-existent block (%d)",
- block_index );
- }
- /* -------------------------------------------------------------------- */
-@@ -343,7 +343,7 @@ int CPCIDSKBitmap::GetOverviewCount()
- PCIDSKChannel *CPCIDSKBitmap::GetOverview( CPL_UNUSED int i )
- {
- // The %d is ignored in the exception.
-- ThrowPCIDSKException("Non-existant overview %d requested on bitmap segment.");
-+ ThrowPCIDSKException("Non-existent overview %d requested on bitmap segment.");
- return NULL;
- }
-
diff --git a/debian/patches/hardening b/debian/patches/hardening
deleted file mode 100644
index dacc2af..0000000
--- a/debian/patches/hardening
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Add support for all hardening buildflags.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/gdal/ticket/5998
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/30006
- https://trac.osgeo.org/gdal/changeset/29360
-
---- a/swig/perl/Makefile.PL
-+++ b/swig/perl/Makefile.PL
-@@ -1,4 +1,5 @@
- use ExtUtils::MakeMaker;
-+use Config;
-
- # pick up our parameters from @ARGV
- my %ARGV;
-@@ -120,6 +121,8 @@ for my $module (keys %object) {
- MAKEFILE => 'Makefile_'.$add,
- LIBS => $LIB,
- INC => $INC,
-+ OPTIMIZE => "$ENV{CFLAGS} $ENV{CPPFLAGS}",
-+ LD => "$Config{ld} $ENV{CFLAGS} $ENV{LDFLAGS}",
- OBJECT => $object{$module},
- PM => {'lib/Geo/GDAL.pm' => '$(INST_LIBDIR)/GDAL.pm',
- 'lib/Geo/OGR.pm' => '$(INST_LIBDIR)/OGR.pm',
---- a/swig/java/GNUmakefile
-+++ b/swig/java/GNUmakefile
-@@ -100,10 +100,10 @@ $(JAVA_MODULES): lib%jni.$(SO_EXT): %_wr
- # Do not remove -fno-strict-aliasing while SWIG generates weird code in upcast methods
- # See http://trac.osgeo.org/gdal/changeset/16006
- %.$(OBJ_EXT): %.cpp
-- $(CXX) -fno-strict-aliasing $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
-+ $(CXX) -fno-strict-aliasing $(CFLAGS) $(CPPFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
-
- %.$(OBJ_EXT): %.cxx
-- $(CXX) -fno-strict-aliasing $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
-+ $(CXX) -fno-strict-aliasing $(CFLAGS) $(CPPFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
-
- %.$(OBJ_EXT): %.c
-- $(CC) -fno-strict-aliasing $(CFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
-+ $(CC) -fno-strict-aliasing $(CFLAGS) $(CPPFLAGS) $(GDAL_INCLUDE) $(JAVA_INCLUDE) -c $<
diff --git a/debian/patches/initalize-typo b/debian/patches/initalize-typo
deleted file mode 100644
index 2a38163..0000000
--- a/debian/patches/initalize-typo
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix 'initialized' typo, replace with 'initialized'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5995
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/29351
-
---- a/gcore/rasterio.cpp
-+++ b/gcore/rasterio.cpp
-@@ -459,7 +459,7 @@ CPLErr GDALRasterBand::IRasterIO( GDALRW
-
- // FIXME: this code likely doesn't work if the dirty block gets flushed
- // to disk before being completely written.
-- // In the meantime, bJustInitalize should probably be set to FALSE
-+ // In the meantime, bJustInitialize should probably be set to FALSE
- // even if it is not ideal performance wise, and for lossy compression
-
- /* -------------------------------------------------------------------- */
-@@ -3165,7 +3165,7 @@ GDALDataset::BlockBasedRasterIO( GDALRWF
-
- // FIXME: this code likely doesn't work if the dirty block gets flushed
- // to disk before being completely written.
-- // In the meantime, bJustInitalize should probably be set to FALSE
-+ // In the meantime, bJustInitialize should probably be set to FALSE
- // even if it is not ideal performance wise, and for lossy compression
-
- /* -------------------------------------------------------------------- */
diff --git a/debian/patches/series b/debian/patches/series
index 9fef244..a6cc7d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,4 @@ mrsid-plugin
symver
spatialite
java.opt
-initalize-typo
-hardening
perl-vendor
-existant-typo
--
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