[SCM] gdal branch, master, updated. upstream/1.8.1-95-g2589cfc

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 2589cfc6b2dd490024418c6960ffb821911206db
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Feb 23 14:31:56 2012 +0100

    New supports added.

diff --git a/debian/changelog b/debian/changelog
index cae417f..a32bd99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gdal (1.9.0-1~exp3) experimental; urgency=low
+
+  * Added b-deps and enabled a few new supports: 
+    Poppler, Armadillo, OpenJPEG, FreeXL and libZMA.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 23 Feb 2012 12:40:19 +0100
+
 gdal (1.9.0-1~exp2) experimental; urgency=low
 
   * Fixed mipsel, mips, powerpc and s390 files for syntax errors that caused
diff --git a/debian/control b/debian/control
index 3fff04d..d84f174 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 8), zlib1g-dev, libnetcdf-dev (>= 1:4.0.0),
  python-numpy, doxygen, d-shlibs, libgeos-dev, libmysqlclient-dev, python-all-dev (>= 2.6.6-3~), 
  libcurl4-gnutls-dev, libsqlite3-dev, libogdi3.2-dev,
  ruby, ruby1.8-dev, chrpath, swig, patch, libexpat1-dev, libproj-dev,
- libdap-dev, libxml2-dev, libspatialite-dev (>= 2.4.0~rc2-4), libepsilon-dev (>= 0.9.1)
+ libdap-dev, libxml2-dev, libspatialite-dev (>= 2.4.0~rc2-4), libepsilon-dev (>= 0.9.1),
+ libpoppler-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev, libfreexl-dev (>= 1.0.0)
 Build-Conflicts: python-setuptools
 Standards-Version: 3.9.2
 XS-Python-Version: all
diff --git a/debian/rules b/debian/rules
index 76e6ac5..51dbfa6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,6 +85,11 @@ configure-stamp:
 			--with-static-proj4=yes \
 			--with-spatialite=/usr \
 			--with-cfitsio=no \
+			--with-ecw=no \
+			--with-mrsid=no \
+			--with-poppler=yes \
+			--with-openjpeg=yes \
+			--with-freexl=yes \
 			--with-epsilon=/usr; \
 		mv GDALmake.opt GDALmake.opt-$$V; \
 	done

-- 
GDAL/OGR library and tools