[gdal] 02/06: Merge tag 'debian/2.0.2+dfsg-5' into experimental-2.1

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental-2.1
in repository gdal.

commit 3d9d0af0623db24e4714bb3784578e42c46b6e36
Merge: 4f36939 dc6e4e1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Apr 3 20:58:37 2016 +0200

    Merge tag 'debian/2.0.2+dfsg-5' into experimental-2.1
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/series
    	debian/rules

 debian/changelog                |  9 +++++++++
 debian/control                  |  2 ++
 debian/libgdal20.symbols.common | 10 ----------
 debian/rules                    |  1 +
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index 5fcbdd2,d588c50..cfb0ed5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,12 +1,39 @@@
 +gdal (2.1.0~beta1+dfsg-1~exp2) UNRELEASED; urgency=medium
 +
 +  * Update symbols for amd64, arm64, armel, armhf, i386, kfreebsd-{amd64,i386},
 +    mips, mipsel, powerpc, ppc64el & s390x.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sun, 03 Apr 2016 12:13:04 +0200
 +
 +gdal (2.1.0~beta1+dfsg-1~exp1) experimental; urgency=medium
 +
 +  * New upstream beta release.
 +  * Update copyright file, changes:
 +    - Update copyright years for Even Rouault
 +    - Add Airbus DS Geo SA, Faza Mahamood & Mikhail Gusev to copyright holders
 +    - Update copyright years for Free Software Foundation, Inc.
 +    - Switch from GPL-2+ to GPL-3+ for config.{sub,guess}
 +    - Add license & copyright for Qhull
 +  * Enable QHull support.
 +  * Enable cryptopp support.
 +  * Drop patches applied upstream. Refresh remaining patches.
 +  * Add patch to bump minimum Java version to 5 for annotations.
 +  * Include additional manpages in gdal-bin.
 +  * Have dh_numpy{,3} act on specific package only.
 +  * Add patch to fix privacy-breach-logo issues in documentation.
 +  * Reorder (build) dependencies and configure options.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 02 Apr 2016 16:51:24 +0200
 +
+ gdal (2.0.2+dfsg-5) unstable; urgency=medium
+ 
+   * Build with external libjson-c instead of internal copy.
+     (LP: #1565475)
+   * Have dh_numpy{,3} act on specific package only.
+   * Reorder (build) dependencies and configure options.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 03 Apr 2016 20:01:55 +0200
+ 
  gdal (2.0.2+dfsg-4) unstable; urgency=medium
  
    * Disable JasPer support, will be removed from stretch.
diff --cc debian/control
index 69b9311,32b2ec8..5b59519
--- a/debian/control
+++ b/debian/control
@@@ -106,19 -100,12 +107,20 @@@ Depends: libgdal20 (= ${binary:Version}
           libhdf4-alt-dev,
           libhdf5-dev,
           libjpeg-dev,
+          libjson-c-dev,
 +         libkml-dev,
           libltdl-dev,
 +         liblzma-dev,
           libmysqlclient-dev,
           libnetcdf-dev,
 +         libogdi3.2-dev,
 +         libopenjp2-7-dev,
 +         libpcre3-dev,
           libpng-dev,
 +         libpoppler-private-dev,
           libpq-dev,
 +         libproj-dev,
 +         libqhull-dev,
           libspatialite-dev,
           libsqlite3-dev,
           libtiff-dev,
diff --cc debian/libgdal20.symbols.common
index 82d6d63,2d26e20..6a5686b
--- a/debian/libgdal20.symbols.common
+++ b/debian/libgdal20.symbols.common
@@@ -1721,16 -1593,5 +1721,6 @@@
   VSIUngetc at Base 1.8.0
   VSIUnlink at Base 1.8.0
   _CPLAssert at Base 1.8.0
-  gdal_json_object_array_add at Base 2.0.1
-  gdal_json_object_new_array at Base 2.0.1
-  gdal_json_object_new_double at Base 2.0.1
-  gdal_json_object_new_int64 at Base 2.0.1
-  gdal_json_object_new_int at Base 2.0.1
-  gdal_json_object_new_object at Base 2.0.1
-  gdal_json_object_new_string at Base 2.0.1
-  gdal_json_object_object_add at Base 2.0.1
-  gdal_json_object_put at Base 2.0.1
-  gdal_json_object_to_json_string_ext at Base 2.0.1
   json_object_new_double_with_precision at Base 2.0.1
 + json_object_new_double_with_significant_figures at Base 2.1.0~beta1
   sqlite3_extension_init at Base 1.10.1

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