[SCM] gdal branch, 1.7, updated. upstream/1.7.3-26-g03bb89b

[Francesco Paolo Lovergine]

The following commit has been merged in the 1.7 branch:
commit 1bbc46768b6590ba7216112ccfb96d3f3dc44f46
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Aug 31 12:50:13 2011 +0200

    Ops! Missing #define in the latest patch added.

diff --git a/debian/patches/dods b/debian/patches/dods
index 13a5b23..284d8a6 100644
--- a/debian/patches/dods
+++ b/debian/patches/dods
@@ -1,8 +1,8 @@
 Index: gdal/frmts/dods/dodsdataset2.cpp
 ===================================================================
---- gdal.orig/frmts/dods/dodsdataset2.cpp	2011-08-31 11:51:34.000000000 +0200
-+++ gdal/frmts/dods/dodsdataset2.cpp	2011-08-31 12:09:07.000000000 +0200
-@@ -50,7 +50,15 @@
+--- gdal.orig/frmts/dods/dodsdataset2.cpp	2011-08-31 12:17:13.000000000 +0200
++++ gdal/frmts/dods/dodsdataset2.cpp	2011-08-31 12:49:08.000000000 +0200
+@@ -50,7 +50,16 @@
  #include <Sequence.h>
  #include <Grid.h>
  
@@ -11,6 +11,7 @@ Index: gdal/frmts/dods/dodsdataset2.cpp
 +#ifdef LIBDAP_310
 +/* AISConnect.h/AISConnect class was renamed to Connect.h/Connect in libdap 3.10 */
 +#include <Connect.h>		
++#define AISConnect Connect 
 +#else
  #include <AISConnect.h>		
 +#endif
@@ -20,15 +21,16 @@ Index: gdal/frmts/dods/dodsdataset2.cpp
  #include <BaseTypeFactory.h>
 Index: gdal/ogr/ogrsf_frmts/dods/ogr_dods.h
 ===================================================================
---- gdal.orig/ogr/ogrsf_frmts/dods/ogr_dods.h	2011-08-31 12:12:46.000000000 +0200
-+++ gdal/ogr/ogrsf_frmts/dods/ogr_dods.h	2011-08-31 12:14:43.000000000 +0200
-@@ -61,7 +61,13 @@
+--- gdal.orig/ogr/ogrsf_frmts/dods/ogr_dods.h	2011-08-31 12:17:13.000000000 +0200
++++ gdal/ogr/ogrsf_frmts/dods/ogr_dods.h	2011-08-31 12:49:48.000000000 +0200
+@@ -61,7 +61,14 @@
  #include <Sequence.h>
  #include <Grid.h>
  
 +#define LIBDAP_310 /* This is supposed to be linked only against 3.10+ a better fix is included upstream */
 +#ifdef LIBDAP_310
 +#include <Connect.h>
++#define AISConnect Connect 
 +#else
  #include <AISConnect.h>		
 +#endif

-- 
GDAL/OGR library and tools