[gdal-grass] 02/05: Merge tag 'debian/2.0.2-2' 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-grass.

commit ceb58feed91e869339c8f8c5ee83ff303f121905
Merge: d6abdb9 67e9baa
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun May 1 17:26:27 2016 +0200

    Merge tag 'debian/2.0.2-2' into experimental-2.1
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/control.in

 debian/changelog  | 9 ++++++++-
 debian/control    | 6 +++---
 debian/control.in | 4 ++--
 debian/rules      | 3 +++
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index c39e85b,2817e84..f9990dc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,17 @@@
 +libgdal-grass (2.1.0~beta1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream beta release.
-   * Bump Standards-Version to 3.9.8, no changes.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 02 Apr 2016 18:26:38 +0200
 +
+ libgdal-grass (2.0.2-2) unstable; urgency=medium
+ 
+   * Bump minimum GRASS version to 7.0.4.
+   * Bump Standards-Version to 3.9.8, no changes.
+   * Enable bindnow hardening buildflags.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 01 May 2016 16:19:41 +0200
+ 
  libgdal-grass (2.0.2-1) unstable; urgency=medium
  
    * Move from experimental to unstable.
diff --cc debian/control
index 96e949e,4e97b5e..73baeeb
--- a/debian/control
+++ b/debian/control
@@@ -7,21 -7,21 +7,21 @@@ Priority: optiona
  Build-Depends: debhelper (>= 9),
                 dh-autoreconf,
                 d-shlibs,
-                grass (>= 7.0.3),
-                grass-dev (>= 7.0.3),
+                grass (>= 7.0.4),
+                grass-dev (>= 7.0.4),
 -               libgdal-dev (>= 2.0.2),
 +               libgdal-dev (>= 2.1.0~),
                 libproj-dev,
                 libpq-dev,
                 pkg-config
  Standards-Version: 3.9.8
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gdal-grass.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git -b experimental-2.1
  Homepage: http://www.gdal.org/
  
 -Package: libgdal20-2.0.2-grass
 +Package: libgdal20-2.1.0-grass
  Architecture: any
  Section: libs
- Depends: grass703,
+ Depends: grass704,
           ${shlibs:Depends},
           ${misc:Depends}
  Recommends: gdal-bin
diff --cc debian/control.in
index 4797016,22cd31e..5d704f7
--- a/debian/control.in
+++ b/debian/control.in
@@@ -7,9 -7,9 +7,9 @@@ Priority: optiona
  Build-Depends: debhelper (>= 9),
                 dh-autoreconf,
                 d-shlibs,
-                grass (>= 7.0.3),
-                grass-dev (>= 7.0.3),
+                grass (>= 7.0.4),
+                grass-dev (>= 7.0.4),
 -               libgdal-dev (>= 2.0.2),
 +               libgdal-dev (>= 2.1.0~),
                 libproj-dev,
                 libpq-dev,
                 pkg-config

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