[ncview] 01/02: Merge tag 'debian/2.1.7+ds-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 ncview.

commit a456d84bdaab80ee656ad85f3d3deebfdedfdaf4
Merge: 28ae8b5 977b447
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Apr 6 21:31:29 2016 +0200

    Merge tag 'debian/2.1.7+ds-1' into jessie-backports
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog                      | 10 ++++++++++
 debian/control                        |  4 ++--
 debian/patches/determining-typo.patch | 14 ++++++++++++++
 debian/patches/series                 |  1 +
 debian/rules                          |  3 +++
 src/do_buttons.c                      | 22 ++++++++++++++++++++--
 src/interface/x_interface.c           | 29 +++++++++++++++++++++++------
 src/ncview.defines.h                  |  4 ++--
 8 files changed, 75 insertions(+), 12 deletions(-)

diff --cc debian/changelog
index 98e3a92,8609be9..cfc7f1b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
+ ncview (2.1.7+ds-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update Vcs-Git URL to use HTTPS.
+   * Bump Standards-Version to 3.9.7, no changes.
+   * Add patch to fix 'determining' typo.
+   * Enable all hardening buildflags.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 30 Mar 2016 21:18:04 +0200
+ 
 +ncview (2.1.6+ds-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Fri, 06 Nov 2015 20:29:55 +0100
 +
  ncview (2.1.6+ds-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 589b148,2d57586..2242473
--- a/debian/control
+++ b/debian/control
@@@ -16,9 -16,9 +16,9 @@@ Build-Depends: debhelper (>= 9)
                 libnetpbm10-dev,
                 libudunits2-dev,
                 libxaw7-dev
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/ncview.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/ncview.git -b jessie-backports
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/ncview.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/ncview.git -b jessie-backports
  Homepage: http://meteora.ucsd.edu/~pierce/ncview_home_page.html
  
  Package: ncview

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