[gmt-gshhg] 01/02: Merge tag 'debian/2.3.6-1' into jessie-backports

[Bas Couwenberg]

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

sebastic pushed a commit to branch jessie-backports
in repository gmt-gshhg.

commit 83ac74afeb92253030f1447dc912ace9bd95a024
Merge: d06b887 4447471
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 26 08:38:09 2016 +0200

    Merge tag 'debian/2.3.6-1' into jessie-backports
    
    Conflicts:
    	debian/changelog

 LICENSE.TXT        |   2 +-
 README.TXT         |  14 ++++++++++----
 binned_GSHHS_c.nc  | Bin 125828 -> 136637 bytes
 binned_GSHHS_f.nc  | Bin 31896036 -> 31936031 bytes
 binned_GSHHS_h.nc  | Bin 8426069 -> 8437608 bytes
 binned_GSHHS_i.nc  | Bin 2195592 -> 2206579 bytes
 binned_GSHHS_l.nc  | Bin 539523 -> 550281 bytes
 binned_border_c.nc | Bin 51165 -> 60793 bytes
 binned_border_f.nc | Bin 2119457 -> 2129173 bytes
 binned_border_h.nc | Bin 499272 -> 508898 bytes
 binned_border_i.nc | Bin 207562 -> 217188 bytes
 binned_border_l.nc | Bin 89053 -> 98681 bytes
 binned_river_c.nc  | Bin 219467 -> 229095 bytes
 binned_river_f.nc  | Bin 7609718 -> 7619434 bytes
 binned_river_h.nc  | Bin 2257314 -> 2266940 bytes
 binned_river_i.nc  | Bin 898855 -> 908481 bytes
 binned_river_l.nc  | Bin 355145 -> 364773 bytes
 debian/changelog   |   6 ++++++
 18 files changed, 17 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index fc96711,28aa630..d99f073
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ gmt-gshhg (2.3.6-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 20 Aug 2016 10:58:37 +0200
+ 
 +gmt-gshhg (2.3.5-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sun, 08 May 2016 16:20:13 +0200
 +
  gmt-gshhg (2.3.5-1) unstable; urgency=medium
  
    * New upstream release.

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