[gdal-grass] 01/03: Merge branch 'experimental-2.0'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository gdal-grass.

commit 734399a24b8c7680f36a4d91a8cd91a29ac0a717
Merge: 818df27 d0aac43
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 1 23:04:41 2016 +0100

    Merge branch 'experimental-2.0'
    
    Conflicts:
    	VERSION
    	configure.in
    	debian/changelog
    	debian/control
    	debian/control.in
    	debian/gbp.conf
    	debian/patches/rpath
    	debian/patches/series

 README                                             |  8 ++---
 VERSION                                            |  2 +-
 configure.in                                       |  2 +-
 debian/changelog                                   |  8 +++++
 debian/control                                     |  6 ++--
 debian/control.in                                  |  6 ++--
 ...des => libgdal20-2.0.2-grass.lintian-overrides} |  4 +--
 debian/patches/environment-typo                    | 38 ----------------------
 debian/patches/rpath                               |  4 ++-
 debian/patches/series                              |  1 -
 grass57dataset.cpp                                 | 18 ++++++----
 ogrgrass.h                                         | 14 ++++----
 ogrgrassdatasource.cpp                             | 10 +++---
 ogrgrassdriver.cpp                                 | 23 ++++++++++---
 ogrgrasslayer.cpp                                  | 25 +++++++-------
 15 files changed, 81 insertions(+), 88 deletions(-)

diff --cc debian/control
index d7b1ab2,614aa4a..139658c
--- a/debian/control
+++ b/debian/control
@@@ -13,12 -13,12 +13,12 @@@ Build-Depends: debhelper (>= 9)
                 libproj-dev,
                 libpq-dev,
                 pkg-config
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gdal-grass.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git -b experimental-2.0
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git
  Homepage: http://www.gdal.org/
  
- Package: libgdal1-1.11.3-grass
+ Package: libgdal20-2.0.2-grass
  Architecture: any
  Section: libs
  Depends: grass703,
diff --cc debian/control.in
index 1375346,e7e9d52..5698bd3
--- a/debian/control.in
+++ b/debian/control.in
@@@ -13,12 -13,12 +13,12 @@@ Build-Depends: debhelper (>= 9)
                 libproj-dev,
                 libpq-dev,
                 pkg-config
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.7
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gdal-grass.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git -b experimental-2.0
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git
  Homepage: http://www.gdal.org/
  
- Package: libgdal1-1.11.3-grass
+ Package: libgdal20-2.0.2-grass
  Architecture: any
  Section: libs
  Depends: @GRASS_ABI@,

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