[SCM] gdal branch, master, updated. upstream/1.8.1-68-g7b555aa

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit dc99347e97840656c148b882f347c48bafa6aca0
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Oct 6 09:46:11 2011 +0200

    Added conflict/provides/replaces for libgdal-dev against libgdal1-dev.

diff --git a/debian/control b/debian/control
index e4ebca6..a082a7a 100644
--- a/debian/control
+++ b/debian/control
@@ -51,6 +51,8 @@ Depends: libgdal1 (=${binary:Version}), libc6-dev, libnetcdf-dev,
  libspatialite-dev, libdap-dev, ${misc:Depends}
 Suggests: libgdal-doc
 Provides: libgdal1-dev
+Replaces: libgdal1-dev
+Conflicts: libgdal1-dev
 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