[gdal] 03/06: Merge tag 'debian/2.1.2+dfsg-5' into experimental

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository gdal.

commit 2b56a7a46ae24a7a26dc893bd18c21d23b50f35f
Merge: 9a1fd3b ba5c923
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Apr 9 15:41:49 2017 +0200

    Merge tag 'debian/2.1.2+dfsg-5' into experimental

 debian/changelog | 7 +++++++
 debian/control   | 1 +
 2 files changed, 8 insertions(+)

diff --cc debian/changelog
index 261eebe,e7f1644..fc8468c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,38 -1,10 +1,45 @@@
 +gdal (2.1.3+dfsg-1~exp3) experimental; urgency=medium
 +
 +  * Update symbols for alpha.
 +  * Merge changes from gdal (2.1.2+dfsg-4).
 +    (closes: #859368)
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 03 Apr 2017 01:10:07 +0200
 +
 +gdal (2.1.3+dfsg-1~exp2) experimental; urgency=medium
 +
 +  * Update symbols for kfreebsd-{amd64,i386}.
 +  * Add upstream patch to fix _gdal_array ImportError with Python 3.
 +    (closes: #853900)
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Thu, 02 Feb 2017 19:22:17 +0100
 +
 +gdal (2.1.3+dfsg-1~exp1) experimental; urgency=medium
 +
 +  * New upstream release.
 +  * Update symbols for 2.1.3, add symbols for m68k.
 +  * Update watch file for final releases.
 +  * Strip pre-releases from ABI version when creating new symbols files.
 +  * Use dpkg-architecture to set DEB_HOST_MULTIARCH if not already set.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 27 Jan 2017 12:52:52 +0100
 +
 +gdal (2.1.3~rc1+dfsg-1~exp1) experimental; urgency=medium
 +
 +  * New upstream release candidate.
 +  * Update watch file for 2.1.3 (pre-)releases.
 +  * Drop svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch,
 +    included upstream. Refresh remaining patches.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 20 Jan 2017 10:35:53 +0100
 +
+ gdal (2.1.2+dfsg-5) unstable; urgency=medium
+ 
+   * Mark libgdal20 as breaking libgdal1h to fix upgrades.
+     (closes: #859918)
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 09 Apr 2017 13:22:29 +0200
+ 
  gdal (2.1.2+dfsg-4) unstable; urgency=medium
  
    * Enable PIE hardening flags.
diff --cc debian/control
index 82963a0,6bb59ea..7164fd0
--- a/debian/control
+++ b/debian/control
@@@ -69,7 -69,8 +69,8 @@@ Section: lib
  Depends: ${shlibs:Depends},
           ${misc:Depends}
  Recommends: proj-bin
+ Breaks: libgdal1h (<< 2.0)
 -Provides: gdal-abi-2-1-2
 +Provides: gdal-abi-2-1-3
  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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git