[SCM] gdal branch, master, updated. upstream/1.10.1+dfsg-82-g554aeb7

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 554aeb7dfa4d39735a75ffe4fa71c37f56ac627f
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Dec 18 13:16:12 2013 +0100

    Requested fix for HDF5 dev packages.

diff --git a/debian/changelog b/debian/changelog
index 88cda36..0f8e3f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gdal (1.10.1+dfsg-2) unstable; urgency=medium
+
+  * Moved to libhdf5-dev b-d with the right versioning. 
+    (closes: #689426)
+  * Policy bumped to 3.9.5, no changes.
+  * Added a Breaks for python-gdal vs gdal-bin due to gdal_retile.1 collision
+    in pre-1.10 versions distributed in experimental. Just for safety.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 18 Dec 2013 13:10:55 +0100
+
 gdal (1.10.1+dfsg-1) unstable; urgency=medium
 
   [ Bas Couwenberg ]
diff --git a/debian/control b/debian/control
index c4cbd55..8050e6e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9),
                libjpeg-dev,
                libgif-dev,
                libhdf4-alt-dev,
-               libhdf5-serial-dev (>= 1.6.6),
+               libhdf5-dev (>= 1.8.8),
                libpq-dev,
                libxerces-c-dev,
                unixodbc-dev (>= 2.2.11),
@@ -49,7 +49,7 @@ Build-Depends: debhelper (>= 9),
                default-jdk,
                ant
 Build-Conflicts: python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/gdal.git
 Vcs-Git: git://anonscm.debian.org/git/pkg-grass/gdal.git
 Homepage: http://www.gdal.org/
@@ -121,7 +121,7 @@ Depends: libgdal1h (= ${binary:Version}),
          libjpeg-dev,
          libgif-dev,
          libhdf4-alt-dev,
-         libhdf5-serial-dev,
+         libhdf5-dev,
          libpq-dev,
          libxerces-c-dev,
          unixodbc-dev,
@@ -186,6 +186,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: python-gdal
+Breaks: gdal-bin (<< 1.10.0-0~)
 Description: Geospatial Data Abstraction Library - Utility programs
  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