[DebianGIS-dev] r492 - packages/gdal/trunk/debian/patches

[Francesco Lovergine]

Author: frankie
Date: 2006-07-29 08:50:33 +0000 (Sat, 29 Jul 2006)
New Revision: 492

Modified:
   packages/gdal/trunk/debian/patches/00list
   packages/gdal/trunk/debian/patches/ogrili2layer.cpp.dpatch
Log:
Revised ogrili2layer.cpp patch


Modified: packages/gdal/trunk/debian/patches/00list
===================================================================
--- packages/gdal/trunk/debian/patches/00list	2006-07-20 17:14:18 UTC (rev 491)
+++ packages/gdal/trunk/debian/patches/00list	2006-07-29 08:50:33 UTC (rev 492)
@@ -1,5 +1,2 @@
 libname
 ogrili2layer.cpp
-#351372_mipsel_ftbfs
-#357189_gcc4.1_ftbfs
-#360389_amd64_ftbfs

Modified: packages/gdal/trunk/debian/patches/ogrili2layer.cpp.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/ogrili2layer.cpp.dpatch	2006-07-20 17:14:18 UTC (rev 491)
+++ packages/gdal/trunk/debian/patches/ogrili2layer.cpp.dpatch	2006-07-29 08:50:33 UTC (rev 492)
@@ -6,22 +6,9 @@
 
 @DPATCH@
 diff -urNad gdal-1.3.2~/ogr/ogrsf_frmts/ili/ogrili2layer.cpp gdal-1.3.2/ogr/ogrsf_frmts/ili/ogrili2layer.cpp
---- gdal-1.3.2~/ogr/ogrsf_frmts/ili/ogrili2layer.cpp	2006-06-21 17:40:10.000000000 +0200
-+++ gdal-1.3.2/ogr/ogrsf_frmts/ili/ogrili2layer.cpp	2006-06-21 21:41:42.000000000 +0200
-@@ -28,6 +28,9 @@
-  ******************************************************************************
-  *
-  * $Log$
-  * Revision 1.2  2006/06/22 09:26:42  frankie
-  * *** empty log message ***
-  *
-+ * Revision 1.5  2006/06/06 17:49:07  pka
-+ * STL compatibility (Bug 1178)
-+ *
-  * Revision 1.4  2005/11/21 14:56:31  pka
-  * Fix for call of GetNextFeature without ResetReading (Interlis 2)
-  * Fix for polygonizer crash on Linux with GEOS 2.1.3 (Interlis 1)
-@@ -73,7 +76,6 @@
+--- gdal-1.3.2~/ogr/ogrsf_frmts/ili/ogrili2layer.cpp	2005-11-21 15:56:31.000000000 +0100
++++ gdal-1.3.2/ogr/ogrsf_frmts/ili/ogrili2layer.cpp	2006-07-20 20:37:10.000000000 +0200
+@@ -73,7 +73,6 @@
      poFeatureDefn->SetGeomType( eReqType );
  
      bWriter = bWriterIn;
@@ -29,7 +16,7 @@
  }
  
  /************************************************************************/
-@@ -116,6 +118,7 @@
+@@ -116,6 +115,7 @@
  
  OGRErr OGRILI2Layer::SetFeature (OGRFeature *poFeature) {
      listFeature.push_back(poFeature);
@@ -37,7 +24,7 @@
      return OGRERR_NONE;
  }
  
-@@ -132,7 +135,6 @@
+@@ -132,7 +132,6 @@
  /************************************************************************/
  
  OGRFeature *OGRILI2Layer::GetNextFeature() {