[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 91a964b82134eb68c208e082746abd61b80a1254
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed May 9 13:05:10 2012 +0200

    Reintroducing a proper transitional pkg libgdal1-dev to satisfy
    versioned dependencies.

diff --git a/debian/changelog b/debian/changelog
index 09125e8..0142460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gdal (1.9.0-2) unstable; urgency=low
+
+  * Reintroducing libgdal1-dev as a transitional package to allow r-deps
+    to build in any environment.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 09 May 2012 13:00:22 +0200
+
 gdal (1.9.0-1) unstable; urgency=low
 
   * Ready for sid, starting transition.
diff --git a/debian/control b/debian/control
index 94e861a..9b94bfd 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,31 @@ Description: Geospatial Data Abstraction Library
  .
  This package contains the shared library.
 
+Package: libgdal1-dev
+Section: libdevel
+Architecture: all
+Depends: libgdal-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
+ calling application for all supported formats. The related OGR
+ library (which lives within the GDAL source tree) provides
+ a similar capability for simple features vector data.
+ .
+ GDAL supports many popular data formats, including commonly used
+ ones (GeoTIFF, JPEG, PNG and more) as well as the ones used in
+ GIS and remote sensing software packages (ERDAS Imagine,
+ ESRI Arc/Info, ENVI, PCI Geomatics). Also supported many remote
+ sensing and scientific data distribution formats such as HDF,
+ EOS FAST, NOAA L1B, NetCDF, FITS.
+ .
+ OGR library supports popular vector formats like ESRI Shapefile,
+ TIGER data, S57, MapInfo File, DGN, GML and more.
+ .
+ This is a transitional dummy package that depends on libgdal-dev 
+ and is used to allow versioned build dependencies to work in 
+ any build environment.
+
 Package: libgdal-dev
 Section: libdevel
 Architecture: any
@@ -52,9 +77,6 @@ Depends: libgdal1 (=${binary:Version}), libc6-dev, libnetcdf-dev,
  libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev, libcurl4-dev|libcurl3-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