[SCM] gdal branch, master, updated. upstream/1.8.1-102-g65329e4

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit dd21e1f04a8ff071a436e06ff38641488cc067f4
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Mar 2 14:50:39 2012 +0100

    Enabled libkml support instead of the old one.

diff --git a/debian/changelog b/debian/changelog
index a32bd99..2527123 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gdal (1.9.0-1~exp4) experimental; urgency=low
+
+  * Moving from old KML to new libkml based.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 02 Mar 2012 14:44:23 +0100
+
 gdal (1.9.0-1~exp3) experimental; urgency=low
 
   * Added b-deps and enabled a few new supports: 
diff --git a/debian/control b/debian/control
index d84f174..ce70d21 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 8), zlib1g-dev, libnetcdf-dev (>= 1:4.0.0),
  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),
- libpoppler-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev, libfreexl-dev (>= 1.0.0)
+ libpoppler-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev, libfreexl-dev (>= 1.0.0),
+ libkml-dev
 Build-Conflicts: python-setuptools
 Standards-Version: 3.9.2
 XS-Python-Version: all
diff --git a/debian/rules b/debian/rules
index 51dbfa6..2741436 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,6 +90,7 @@ configure-stamp:
 			--with-poppler=yes \
 			--with-openjpeg=yes \
 			--with-freexl=yes \
+			--with-libkml=yes \
 			--with-epsilon=/usr; \
 		mv GDALmake.opt GDALmake.opt-$$V; \
 	done

-- 
GDAL/OGR library and tools