- obsolete

Changed files:
    gdal-DESTDIR.patch -> 1.8
    gdal-gcc4.patch -> 1.3
    gdal-pgsql.patch -> 1.4

diff --git a/gdal-DESTDIR.patch b/gdal-DESTDIR.patch
deleted file mode 100644 (file)
index 7d5d8ad..0000000
--- a/gdal-DESTDIR.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- gdal-1.3.2/GNUmakefile.orig        2006-03-24 17:51:56.000000000 +0100
-+++ gdal-1.3.2/GNUmakefile     2006-05-29 07:38:45.280728750 +0200
-@@ -141,8 +141,8 @@
- 
- install-docs:
-       (cd ogr; $(MAKE) install-docs)
--      $(INSTALL_DIR) $(INST_DOCS)/gdal
--      cp html/*.* $(INST_DOCS)/gdal
-+      $(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/gdal
-+      cp html/*.* $(DESTDIR)$(INST_DOCS)/gdal
- 
- web-update:   docs
-       cp html/*.* $(WEB_DIR)
-@@ -150,9 +150,9 @@
- install:      default install-actions
- 
- install-actions: install-lib
--      $(INSTALL_DIR) $(INST_BIN)
--      $(INSTALL_DIR) $(INST_DATA)
--      $(INSTALL_DIR) $(INST_INCLUDE)
-+      $(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
-+      $(INSTALL_DIR) $(DESTDIR)$(INST_DATA)
-+      $(INSTALL_DIR) $(DESTDIR)$(INST_INCLUDE)
-       (cd port; $(MAKE) install)
-       (cd gcore; $(MAKE) install)
-       (cd frmts; $(MAKE) install)
-@@ -166,14 +166,14 @@
- ifneq ($(BINDINGS),)
-       (cd swig; $(MAKE) install)
- endif
--      for f in data/*.* ; do $(INSTALL_DATA) $$f $(INST_DATA) ; done
--      $(LIBTOOL_FINISH) $(INST_LIB)
-+      for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
-+      $(LIBTOOL_FINISH) $(DESTDIR)$(INST_LIB)
- 
- ifeq ($(HAVE_LIBTOOL),yes)
- 
- install-lib:
--      $(INSTALL_DIR) $(INST_LIB)
--      for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(INST_LIB) ; done
-+      $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
-+      for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(DESTDIR)$(INST_LIB) ; done
- 
- else
- 
-@@ -183,21 +183,21 @@
- GDAL_SLIB_B   =       $(notdir $(GDAL_SLIB))
- 
- install-lib:
--      $(INSTALL_DIR) $(INST_LIB)
--      rm -f $(INST_LIB)/$(GDAL_SLIB_B)
--      rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER_MAJOR)
--      rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
--      $(INSTALL_LIB) $(GDAL_SLIB) $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
--      (cd $(INST_LIB) ; \
-+      $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
-+      rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B)
-+      rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER_MAJOR)
-+      rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-+      $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-+      (cd $(DESTDIR)$(INST_LIB) ; \
-        ln -s $(GDAL_SLIB_B).$(GDAL_VER_MAJOR) $(GDAL_SLIB_B))
--      (cd $(INST_LIB) ; \
-+      (cd $(DESTDIR)$(INST_LIB) ; \
-        ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VER_MAJOR))
- 
- else
- 
- install-lib:
--      $(INSTALL_DIR) $(INST_LIB)
--      $(INSTALL_LIB) $(GDAL_LIB) $(INST_LIB)
-+      $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
-+      $(INSTALL_LIB) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
- 
- endif # HAVE_LD_SHARED=no 
- 
---- gdal-1.3.2/ogr/GNUmakefile.orig    2006-03-24 17:51:57.000000000 +0100
-+++ gdal-1.3.2/ogr/GNUmakefile 2006-05-29 07:39:20.254914500 +0200
-@@ -81,9 +81,9 @@
-       cp ogr_feature_style.html html
- 
- install-docs:
--      $(INSTALL_DIR) $(INST_DOCS)/ogr
--      cp html/* $(INST_DOCS)/ogr
--      cp ../doc/ogr/*.gif $(INST_DOCS)/ogr
-+      $(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/ogr
-+      cp html/* $(DESTDIR)$(INST_DOCS)/ogr
-+      cp ../doc/ogr/*.gif $(DESTDIR)$(INST_DOCS)/ogr
- 
- gdalso:       $(GDAL_SLIB)
- 
-@@ -123,14 +123,14 @@
- 
- ifeq ($(OGR_ENABLED),yes)
- install-full: apps
--      $(INSTALL) ogr2ogr $(INST_BIN)
--      $(INSTALL) ogrinfo $(INST_BIN)
--      $(INSTALL) ogrtindex $(INST_BIN)
-+      $(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
-+      $(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
-+      $(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
- else
- install-full:
- endif
- 
- install:      install-full
-       for f in $(INST_H_FILES) ; \
--          do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; \
-+          do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \
-       done
---- gdal-1.2.6/pymod/GNUmakefile.orig  2005-01-31 23:07:02.000000000 +0100
-+++ gdal-1.2.6/pymod/GNUmakefile       2005-03-28 23:55:02.370967240 +0200
-@@ -45,9 +45,9 @@
- 
- # special care is taken so that python scripts are installed as executables
- install:      $(GDALMODULE_SO)
--      $(INSTALL_DIR) $(INST_PYMOD)
--      $(INSTALL_LIB) $(GDALMODULE_SO) $(INST_PYMOD)
--      for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(INST_BIN) ; done
--      for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(INST_PYMOD) ; done
-+      $(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
-+      $(INSTALL_LIB) $(GDALMODULE_SO) $(DESTDIR)$(INST_PYMOD)
-+      for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
-+      for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_PYMOD) ; done
-       # ugh! spurius relinking leaves a file owned by root into .libs/.
-       rm -f .libs/*.soT
---- gdal-1.2.0/port/GNUmakefile.orig   2003-12-28 18:25:00.000000000 +0100
-+++ gdal-1.2.0/port/GNUmakefile        2004-04-07 22:00:08.007464384 +0200
-@@ -25,7 +25,7 @@
-       $(RM) *.o $(LIB)
- 
- install:
--      for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
-+      for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
- 
- xmlreformat:  xmlreformat.o 
-       $(CXX) $(CXXFLAGS) xmlreformat.o $(CONFIG_LIBS) -o xmlreformat
---- gdal-1.2.0/alg/GNUmakefile.orig    2003-12-16 12:13:25.000000000 +0100
-+++ gdal-1.2.0/alg/GNUmakefile 2004-04-07 21:55:34.476047480 +0200
-@@ -22,7 +22,7 @@
-       (cd ..; $(MAKE) docs)
- 
- install:
--      for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
-+      for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
- 
- lib:  $(OBJ)
-       (cd .. ; $(MAKE) force-lib)
---- gdal-1.2.0/apps/GNUmakefile.orig   2004-02-21 15:31:38.000000000 +0100
-+++ gdal-1.2.0/apps/GNUmakefile        2004-04-07 21:55:34.478047176 +0200
-@@ -92,6 +92,6 @@
- 
- 
- install: default
--      for f in $(BIN_LIST) ; do $(INSTALL) $$f $(INST_BIN) ; done
--      $(INSTALL) gdal-config-inst $(INST_BIN)/gdal-config
-+      for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
-+      $(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
- 
---- gdal-1.2.0/gcore/GNUmakefile.orig  2003-12-16 12:13:46.000000000 +0100
-+++ gdal-1.2.0/gcore/GNUmakefile       2004-04-07 21:55:34.479047024 +0200
-@@ -31,4 +31,4 @@
-               $*.cpp -o $*.o
- 
- install:
--      for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
-+      for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
---- gdal-1.2.0/man/GNUmakefile.orig    2004-02-20 18:26:13.000000000 +0100
-+++ gdal-1.2.0/man/GNUmakefile 2004-04-07 22:01:23.370007536 +0200
-@@ -5,5 +5,5 @@
- include ../GDALmake.opt
- 
- install:
--      $(INSTALL_DIR) $(INST_MAN)/man1
--      for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(INST_MAN)/man1 ; done
-+      $(INSTALL_DIR) $(DESTDIR)$(INST_MAN)/man1
-+      for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_MAN)/man1 ; done
---- gdal-1.2.6/frmts/vrt/GNUmakefile.orig      2005-01-24 19:09:57.000000000 +0100
-+++ gdal-1.2.6/frmts/vrt/GNUmakefile   2005-03-29 00:56:45.822956960 +0200
-@@ -19,4 +19,4 @@
- $(OBJ) $(O_OBJ):      vrtdataset.h
- 
- install:
--      $(INSTALL_DATA) vrtdataset.h $(INST_INCLUDE)
-+      $(INSTALL_DATA) vrtdataset.h $(DESTDIR)$(INST_INCLUDE)
---- gdal-1.2.6/frmts/mem/GNUmakefile.orig      2005-01-24 19:09:57.000000000 +0100
-+++ gdal-1.2.6/frmts/mem/GNUmakefile   2005-03-29 01:59:50.803552448 +0200
-@@ -15,4 +15,4 @@
- install-obj:  $(O_OBJ)
- 
- install:
--      $(INSTALL_DATA) memdataset.h $(INST_INCLUDE)
-+      $(INSTALL_DATA) memdataset.h $(DESTDIR)$(INST_INCLUDE)
---- gdal-1.2.6/frmts/raw/GNUmakefile.orig      2005-01-24 19:09:57.000000000 +0100
-+++ gdal-1.2.6/frmts/raw/GNUmakefile   2005-03-29 09:59:16.200547408 +0200
-@@ -21,4 +21,4 @@
- $(OBJ) $(O_OBJ):      rawdataset.h
- 
- install:
--      $(INSTALL_DATA) rawdataset.h $(INST_INCLUDE)
-+      $(INSTALL_DATA) rawdataset.h $(DESTDIR)$(INST_INCLUDE)
---- gdal-1.3.2/swig/python/GNUmakefile.orig    2006-03-24 17:51:58.000000000 +0100
-+++ gdal-1.3.2/swig/python/GNUmakefile 2006-05-29 07:39:37.868015250 +0200
-@@ -24,4 +24,4 @@
-       python setup.py build
- 
- install:
--      python setup.py install --prefix=$(prefix)
-+      python setup.py install --prefix=$(DESTDIR)$(prefix)
---- gdal-1.3.2/swig/ruby/RubyMakefile.mk.orig  2006-01-14 02:48:46.000000000 +0100
-+++ gdal-1.3.2/swig/ruby/RubyMakefile.mk       2006-05-29 07:40:11.162096000 +0200
-@@ -38,11 +38,11 @@
- veryclean: clean
-       rm -frd $(INSTALL_DIR)
- 
--$(INSTALL_DIR):
--      mkdir -v $(INSTALL_DIR)
-+$(DESTDIR)$(INSTALL_DIR):
-+      mkdir -v $(DESTDIR)$(INSTALL_DIR)
- 
--install: $(INSTALL_DIR)
--      $(INSTALL) $(RUBY_MODULES) $(INSTALL_DIR) 
-+install: $(DESTDIR)$(INSTALL_DIR)
-+      $(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) 
- 
- $(RUBY_MODULES): %.so: %_wrap.o
-       $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@

diff --git a/gdal-gcc4.patch b/gdal-gcc4.patch
deleted file mode 100644 (file)
index b8eb8c3..0000000
--- a/gdal-gcc4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- gdal-1.3.2/frmts/fit/fitdataset.cpp.orig   2005-07-05 19:10:52.000000000 +0200
-+++ gdal-1.3.2/frmts/fit/fitdataset.cpp        2006-03-05 13:07:26.440480750 +0100
-@@ -1016,7 +1016,7 @@
-         CPLDebug("FIT", "Loading file with header version 01");
- 
-         // map old style header into new header structure
--      FIThead01* head01 = (FIThead01*)&head;
-+      FIThead01* head01 = (FIThead01*)head;
-         gst_swapb(head->dataOffset);
-       info->dataOffset = head01->dataOffset;
- 
---- gdal-1.3.2/ogr/ogrsf_frmts/ili/ogrili2layer.cpp.orig       2005-11-21 15:56:31.000000000 +0100
-+++ gdal-1.3.2/ogr/ogrsf_frmts/ili/ogrili2layer.cpp    2006-06-03 12:49:56.937947000 +0200
-@@ -73,7 +73,7 @@
-     poFeatureDefn->SetGeomType( eReqType );
- 
-     bWriter = bWriterIn;
--    listFeatureIt = 0;
-+    listFeatureIt = listFeature.begin();
- }
- 
- /************************************************************************/
-@@ -132,7 +132,6 @@
- /************************************************************************/
- 
- OGRFeature *OGRILI2Layer::GetNextFeature() {
--    if (listFeatureIt == 0) listFeatureIt = listFeature.begin();
-     if (listFeatureIt != listFeature.end())
-         return *(listFeatureIt++);
-     return NULL;

diff --git a/gdal-pgsql.patch b/gdal-pgsql.patch
deleted file mode 100644 (file)
index c7a2e08..0000000
--- a/gdal-pgsql.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdal-1.3.2/configure.in.orig       2006-05-01 18:22:48.000000000 +0200
-+++ gdal-1.3.2/configure.in    2006-05-29 01:24:48.086491750 +0200
-@@ -275,7 +275,7 @@
-   PG_EXTRA_DEC=""
-   AC_CHECK_LIB(pq,PQputCopyData,,PG_EXTRA_DEC=-DPG_PRE74,)
- 
--  PG_INC="-I`$PG_CONFIG --includedir` $PG_EXTRA_DEC"
-+  PG_INC="-I`$PG_CONFIG --includedir` -I`$PG_CONFIG --includedir-server` $PG_EXTRA_DEC"
- fi
- 
- AC_SUBST(HAVE_PG,$HAVE_PG)