[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 3151d7e3b4d53fd27484f6dcbd65617526be182e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Oct 11 17:52:31 2013 +0200

    Use versioned Breaks/Replaces instead of Conflicts/Replaces.

diff --git a/debian/changelog b/debian/changelog
index 6eac1db..fc757b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
   * Add lintian overrides for hyphen-used-as-minus-sign and
     manpage-has-errors-from-man, man pages are automatically generated
     with sphinx.
+  * Use versioned Breaks/Replaces instead of Conflicts/Replaces.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/control b/debian/control
index 7adc3da..756d8f5 100644
--- a/debian/control
+++ b/debian/control
@@ -27,9 +27,10 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: proj-bin
-Replaces: libgdal1
-Conflicts: libgdal1 (<= 1.10.0-0~)
-Breaks: libgdal1-1.6.0
+Breaks: libgdal1 (<= 1.10.0-0~),
+        libgdal1-1.6.0 (<= 1.10.0-0~)
+Replaces: libgdal1 (<= 1.10.0-0~),
+          libgdal1-1.6.0 (<= 1.10.0-0~)
 Description: Geospatial Data Abstraction Library
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the
@@ -83,7 +84,7 @@ Depends: libgdal1h (=${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~)
+Breaks: 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.

-- 
GDAL/OGR library and tools