[SCM] gdal branch, master, updated. upstream/1.9.2-130-g0fb346c

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 0fb346cb19b1a729e5cb1d27683ed195b0e9111f
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Jun 20 09:50:20 2013 +0200

    Introduced libgdal1h for transitioning.
    
    The transitioning package is introduced to migrate rdepends to
    a new version that hides all tiff/geotiff symbols in the gdal
    library.

diff --git a/debian/changelog b/debian/changelog
index 112e0c0..82fea4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,11 @@ gdal (1.9.2-1~exp3) experimental; urgency=low
     Thanks to Cédric Boutillier for reviewing and testing this patch.
     (Closes: #684433)
   * Added libarmadillo support.
+  * Added TIFF/GEOTIFF symbols rename to definitively solve problem of
+    symbol collisions for programs that both links geotiff/tiff libraries.
+    This choice implies that the API does not include anymore any *tiff
+    related functions: changed API declaration.
+  * Policy bumped to 3.9.4. No changes required.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Sun, 04 Apr 2013 11:39:57 +0100
 
diff --git a/debian/control b/debian/control
index 8975b90..5bc0c5a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,18 +13,20 @@ Build-Depends: debhelper (>= 8), zlib1g-dev, libnetcdf-dev (>= 1:4.0.0),
  libpoppler-private-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev, libfreexl-dev (>= 1.0.0),
  libkml-dev (>= 1.3.0~), liburiparser-dev, python3-all-dev, python3-numpy
 Build-Conflicts: python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 XS-Python-Version: all
 X-Python3-Version: >= 3.2
 Homepage: http://www.gdal.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/gdal.git
 Vcs-Git: git://git.debian.org/git/pkg-grass/gdal.git
 
-Package: libgdal1
+Package: libgdal1h
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: proj-bin
+Provides: libgdal1
+Conflicts: libgdal1 (<= 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
@@ -72,7 +74,7 @@ Description: Geospatial Data Abstraction Library - Development files
 Package: libgdal-dev
 Section: libdevel
 Architecture: any
-Depends: libgdal1 (=${binary:Version}), libc6-dev, libnetcdf-dev, 
+Depends: libgdal1h (=${binary:Version}), libc6-dev, libnetcdf-dev, 
  libjasper-dev|libjasper-1.701-dev, libpng-dev, libjpeg-dev, libgif-dev, libhdf4-alt-dev, 
  libpq-dev, libxerces-c-dev, unixodbc-dev, libsqlite3-dev, libgeos-dev,
  libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev, libcurl4-gnutls-dev|libcurl4-dev,
@@ -103,7 +105,7 @@ Description: Geospatial Data Abstraction Library - Development files
 Package: libgdal-doc
 Section: doc
 Architecture: all
-Suggests: libgdal1
+Suggests: libgdal1h
 Depends: ${misc:Depends}
 Homepage: http://www.gdal.org/#index_userdocs
 Description: Documentation for the Geospatial Data Abstraction Library
diff --git a/debian/rules b/debian/rules
index c7c798f..bbdb273 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,6 +67,8 @@ configure-stamp:
 			--with-threads \
 			--with-grass=no \
 			--with-hide-internal-symbols=yes \
+			--with-rename-internal-libtiff-symbols=yes \
+			--with-rename-internal-libgeotiff-symbols=yes \
 			--with-libtiff=internal \
 			--with-geotiff=internal \
 			--with-jasper \

-- 
GDAL/OGR library and tools