[SCM] gdal branch, master, updated. upstream/1.8.0-26-g6057817

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit e83b62db3bc32be9caeec650f143ca9be21582b6
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu May 12 13:13:18 2011 +0200

    Fixed for libepsilon >= 0.9.1

diff --git a/debian/changelog b/debian/changelog
index e184060..0ce5fd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,12 @@ gdal (1.8.0-2) experimental; urgency=low
   * Patch: spatialite. Added explicit linking to sqlite3 for spatialite.
     This is Debian specific, because Debian spatialite does not embed Sqlite
     functions as in upstream release.
+  * Merged with 1.7 series: added epsilon patch to fix now unsupported unnamed
+    union use.
+  * Versioned strict build-dependency on libepsilon.
+  * Depends on libjpeg-dev.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 12 May 2011 11:12:36 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 12 May 2011 13:11:06 +0200
 
 gdal (1.8.0-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 77416b2..f64dc8c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 Build-Depends: debhelper (>= 8), zlib1g-dev, libnetcdf-dev (>= 1:4.0.0),
- libjasper-dev, libpng12-dev, libjpeg-dev, libgif-dev,
- libhdf4-alt-dev, libhdf5-serial-dev (>=1.6.6), libpq-dev, libxerces-c2-dev, unixodbc-dev (>= 2.2.11),
+ libjasper-dev, libpng12-dev, libpeg-dev, libgif-dev,
+ libhdf4-alt-dev, libhdf5-serial-dev (>= 1.6.6), libpq-dev, libxerces-c2-dev, unixodbc-dev (>= 2.2.11),
  python-dev, python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev, python-all-dev (>= 2.3.5-11~), 
  python-central (>= 0.5), libcurl4-gnutls-dev, libsqlite3-dev, libogdi3.2-dev,
  ruby, ruby1.8-dev, chrpath, swig, libtool (>= 1.5.24-2), patch, libexpat1-dev, libproj-dev,
- libdap-dev, libxml2-dev, libspatialite-dev (>= 2.4.0~rc2-4), libepsilon-dev
+ libdap-dev, libxml2-dev, libspatialite-dev (>= 2.4.0~rc2-4), libepsilon-dev (>= 0.9.1)
 Build-Conflicts: python-setuptools
 Standards-Version: 3.9.2
 XS-Python-Version: all
@@ -45,7 +45,7 @@ Package: libgdal1-dev
 Section: libdevel
 Architecture: any
 Depends: libgdal1-1.8.0 (=${binary:Version}), libc6-dev, libnetcdf-dev, 
- libjasper-dev|libjasper-1.701-dev, libpng12-dev, libjpeg62-dev, libgif-dev, libhdf4-alt-dev, 
+ libjasper-dev|libjasper-1.701-dev, libpng12-dev, libjpeg-dev, libgif-dev, libhdf4-alt-dev, 
  libpq-dev, libxerces-c2-dev, unixodbc-dev, libsqlite3-dev, libgeos-dev,
  libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev, libcurl4-dev|libcurl3-dev,
  libspatialite-dev, libdap-dev, ${misc:Depends}
diff --git a/debian/patches/epsilon b/debian/patches/epsilon
new file mode 100644
index 0000000..432ae61
--- /dev/null
+++ b/debian/patches/epsilon
@@ -0,0 +1,34 @@
+Index: gdal/frmts/epsilon/epsilondataset.cpp
+===================================================================
+--- gdal.orig/frmts/epsilon/epsilondataset.cpp	2011-05-12 11:50:58.000000000 +0200
++++ gdal/frmts/epsilon/epsilondataset.cpp	2011-05-12 11:53:19.000000000 +0200
+@@ -237,8 +237,8 @@
+         return CE_Failure;
+     }
+     
+-    int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.w : hdr.tc.w;
+-    int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.h : hdr.tc.h;
++    int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.w : hdr.hdr_data.tc.w;
++    int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.h : hdr.hdr_data.tc.h;
+     int i;
+ 
+     if (poGDS->nBands == 1)
+@@ -505,12 +505,12 @@
+             continue;
+         }
+         
+-        int W = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.W : hdr.tc.W;
+-        int H = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.H : hdr.tc.H;
+-        int x = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.x : hdr.tc.x;
+-        int y = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.y : hdr.tc.y;
+-        int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.w : hdr.tc.w;
+-        int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.gs.h : hdr.tc.h;
++        int W = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.W : hdr.hdr_data.tc.W;
++        int H = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.H : hdr.hdr_data.tc.H;
++        int x = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.x : hdr.hdr_data.tc.x;
++        int y = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.y : hdr.hdr_data.tc.y;
++        int w = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.w : hdr.hdr_data.tc.w;
++        int h = (hdr.block_type == EPS_GRAYSCALE_BLOCK) ? hdr.hdr_data.gs.h : hdr.hdr_data.tc.h;
+ 
+         //CPLDebug("EPSILON", "W=%d,H=%d,x=%d,y=%d,w=%d,h=%d,offset=" CPL_FRMT_GUIB,
+         //                    W, H, x, y, w, h, nStartBlockFileOff);
diff --git a/debian/patches/series b/debian/patches/series
index e29d991..977731f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ ecw-plugin
 mrsid-plugin
 symver
 spatialite
+epsilon

-- 
GDAL/OGR library and tools