[SCM] gdal branch, ubuntu/precise, updated. upstream/1.9.0-114-g17181e0

[Jerome Villeneuve Larouche]

The following commit has been merged in the ubuntu/precise branch:
commit 17181e0352c8d210a68e15f5e64d9ac0c433bbc8
Merge: 13f89ee7774343361d0a0b318d694ebbb6ba39b4 67570ba82ea6c1bd3d9fb0aad82ca1789c2652db
Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
Date:   Thu May 31 17:41:10 2012 +0000

    Updated to 1.9.1 for Ubuntu Precise

diff --combined debian/changelog
index 70b4e80,2edcb60..d66da11
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,17 +1,36 @@@
++gdal (1.9.1-2~precise3) precise; urgency=low
++
++  * Launchpad build for precise
++
++ -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 31 May 2012 17:36:09 +0000
++
+ gdal (1.9.1-1) unstable; urgency=low
+ 
+   [ Jerome Villeneuve Larouche ]
+   * New upstream release.
+ 
+   [ Francesco Paolo Lovergine ]
+   * Reintroducing libgdal1-dev as a transitional package to allow r-deps
 -    to build in any environment.
 -  * Removed old depndency on libcurl3-dev for libgdal-dev and added a 
 -    preferred dep on libcurl4-gnutls-dev to make lintian happy.
++  to build in any environment.
++  * Removed old depndency on libcurl3-dev for libgdal-dev and
++  added a preferred dep on libcurl4-gnutls-dev to make lintian happy.
+   * Added build-{arch|indep} targets in debian/rules.
+ 
+  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Fri, 25 May 2012 13:04:34 +0000
+ 
 +gdal (1.9.0-2~precise1) precise; urgency=low
 +
 +  * Launchpad build for precise.
 +  * Remove freexl support.
 +
 + -- Alan Boudreault <aboudreault at mapgears.com>  Tue, 08 May 2012 11:42:03 +0000
 +
 +gdal (1.9.0-2~precise1) precise; urgency=low
 +
 +  * Launchpad build for precise.
 +
 + -- Alan Boudreault <aboudreault at mapgears.com>  Tue, 08 May 2012 11:42:03 +0000
 +
  gdal (1.9.0-1) unstable; urgency=low
  
    * Ready for sid, starting transition.
diff --combined debian/control
index 6378663,b813d7b..e20f053
--- a/debian/control
+++ b/debian/control
@@@ -10,7 -10,7 +10,7 @@@ Build-Depends: debhelper (>= 8), zlib1g
   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,
   libkml-dev, liburiparser-dev
  Build-Conflicts: python-setuptools
  Standards-Version: 3.9.3
@@@ -43,18 -43,42 +43,42 @@@ Description: Geospatial Data Abstractio
   .
   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
  Depends: libgdal1 (=${binary:Version}), libc6-dev, libnetcdf-dev, 
   libjasper-dev|libjasper-1.701-dev, libpng-dev, libjpeg-dev, libgif-dev, libhdf4-alt-dev, 
   libpq-dev, libxerces-c2-dev, unixodbc-dev, libsqlite3-dev, libgeos-dev,
-  libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev, libcurl4-dev|libcurl3-dev,
+  libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev, libcurl4-gnutls-dev|libcurl4-dev,
   libspatialite-dev, libdap-dev, ${misc:Depends}
  Suggests: libgdal-doc
- Provides: libgdal1-dev
- Replaces: libgdal1-dev
- Conflicts: libgdal1-dev
+ 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
diff --combined debian/rules
index 910c576,295a4fa..2998dba
--- a/debian/rules
+++ b/debian/rules
@@@ -89,6 -89,7 +89,6 @@@ configure-stamp
  			--with-mrsid=no \
  			--with-poppler=yes \
  			--with-openjpeg=yes \
 -			--with-freexl=yes \
  			--with-libkml=yes \
  			--with-armadillo=yes \
  			--with-liblzma=yes \
@@@ -98,6 -99,9 +98,9 @@@
  	
  	touch $@
  
+ build-arch: build
+ build-indep: build
+ 
  build: configure-stamp build-stamp
  build-stamp: 
  	dh_testdir
@@@ -221,4 -225,4 +224,4 @@@ binary-indep: build instal
  
  binary: binary-arch binary-indep
  
- .PHONY: build clean binary-arch binary-indep binary-common binary install gdal-grass-dist versions
+ .PHONY: build clean binary-arch binary-indep binary-common binary install gdal-grass-dist versions build-arch build-indep

-- 
GDAL/OGR library and tools