[SCM] gdal branch, master, updated. upstream/1.9.0-112-g67570ba

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit c9aa7a8d708c145b858f4468f4e0de04abdb4d7b
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu May 10 15:53:11 2012 +0200

    Added conflicting against old libgdal1-dev for libgdal-dev

diff --git a/debian/control b/debian/control
index e0eb631..b813d7b 100644
--- a/debian/control
+++ b/debian/control
@@ -77,6 +77,8 @@ Depends: libgdal1 (=${binary:Version}), libc6-dev, libnetcdf-dev,
  libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev, libcurl4-gnutls-dev|libcurl4-dev,
  libspatialite-dev, libdap-dev, ${misc:Depends}
 Suggests: libgdal-doc
+Conflicts: libgdal1-dev (<< 1.9.0-1~)
+Replaces: libgdal1-dev (<< 1.9.0-1~)
 Description: Geospatial Data Abstraction Library - Development files
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the

-- 
GDAL/OGR library and tools