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

[Sebastiaan 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 2a946a5d1f302cc6149c033fb736d34c67b57c83
Merge: 9b2e529 23705b7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun May 8 16:20:08 2016 +0200

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

 README.TXT         |  27 ++++++++++++++++++++++-----
 binned_GSHHS_c.nc  | Bin 125828 -> 125828 bytes
 binned_GSHHS_f.nc  | Bin 31896036 -> 31896036 bytes
 binned_GSHHS_h.nc  | Bin 8426069 -> 8426069 bytes
 binned_GSHHS_i.nc  | Bin 2195592 -> 2195592 bytes
 binned_GSHHS_l.nc  | Bin 539523 -> 539523 bytes
 binned_border_c.nc | Bin 51064 -> 51165 bytes
 binned_border_f.nc | Bin 2117936 -> 2119457 bytes
 binned_border_h.nc | Bin 498416 -> 499272 bytes
 binned_border_i.nc | Bin 207148 -> 207562 bytes
 binned_border_l.nc | Bin 88824 -> 89053 bytes
 binned_river_c.nc  | Bin 219467 -> 219467 bytes
 binned_river_f.nc  | Bin 7609718 -> 7609718 bytes
 binned_river_h.nc  | Bin 2257314 -> 2257314 bytes
 binned_river_i.nc  | Bin 898855 -> 898855 bytes
 binned_river_l.nc  | Bin 355145 -> 355145 bytes
 debian/changelog   |  10 ++++++++++
 debian/control     |   4 ++--
 18 files changed, 34 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index 656896c,5acbbd2..107f89c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,20 @@@
+ gmt-gshhg (2.3.5-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - Fixes border between Slovenia, Croatia and Hungary. (LP: #1547631)
+   * Update Vcs-Git URL to use HTTPS.
+   * Bump Standards-Version to 3.9.8, no changes.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 02 May 2016 11:28:34 +0200
+ 
 +gmt-gshhg (2.3.4-2~bpo8+1) jessie-backports; urgency=medium
 +
++
 +  * Rebuild for jessie-backports.
 +  * Update branch in gbp.conf & Vcs-Git URL.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 27 Jul 2015 13:22:40 +0200
 +
  gmt-gshhg (2.3.4-2) unstable; urgency=medium
  
    * Add README.Debian documenting the origin of the GSHHG data.
diff --cc debian/control
index e8e7500,44ab53e..5c65ceb
--- a/debian/control
+++ b/debian/control
@@@ -4,9 -4,9 +4,9 @@@ Uploaders: Bas Couwenberg <sebastic at deb
  Section: science
  Priority: extra
  Build-Depends: debhelper (>= 9),
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.8
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gmt-gshhg.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/gmt-gshhg.git -b jessie-backports
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gmt-gshhg.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gmt-gshhg.git -b jessie-backports
  Homepage: http://www.soest.hawaii.edu/pwessel/gshhg/index.html
  
  Package: gmt-gshhg

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