[gdal-grass] 01/04: Merge branch 'experimental-2.1' into experimental

Bas Couwenberg sebastic at debian.org
Mon Apr 3 05:38:57 UTC 2017


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

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

commit 3e81a618c5c21463324b478421c38d8ddb0964be
Merge: b53425a 2be83a5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Apr 3 01:18:36 2017 +0200

    Merge branch 'experimental-2.1' into experimental
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/control.in
    	debian/gbp.conf
    	debian/libgdal1-1.11.4-grass.lintian-overrides

 Makefile.in                                    |  23 +-
 README                                         |   8 +-
 VERSION                                        |   2 +-
 configure                                      |  70 +++++-
 configure.in                                   |  19 +-
 debian/changelog                               | 141 +++++++++++
 debian/control                                 |  20 +-
 debian/control.in                              |  18 +-
 debian/libgdal1-1.11.4-grass.lintian-overrides |   3 -
 debian/lintian-overrides                       |   4 +
 debian/lintian-overrides.in                    |   3 -
 debian/patches/environment-typo                |  38 ---
 debian/patches/rpath                           |  10 +-
 debian/patches/series                          |   1 -
 debian/rules                                   |  33 +--
 debian/watch                                   |   6 +-
 grass57dataset.cpp                             | 264 ++++++++++---------
 ogrgrass.h                                     |  38 +--
 ogrgrassdatasource.cpp                         |  63 +++--
 ogrgrassdriver.cpp                             |  27 +-
 ogrgrasslayer.cpp                              | 334 ++++++++++++-------------
 21 files changed, 657 insertions(+), 468 deletions(-)

diff --cc debian/changelog
index fb7a160,e802bab..8b0be7c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,144 +1,151 @@@
+ libgdal-grass (2.1.3-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 27 Jan 2017 13:12:12 +0100
+ 
+ libgdal-grass (2.1.3~rc1-1~exp3) experimental; urgency=medium
+ 
+   * Add Breaks/Replaces for old version specific binary packages.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 26 Jan 2017 21:11:06 +0100
+ 
+ libgdal-grass (2.1.3~rc1-1~exp2) experimental; urgency=medium
+ 
+   * Rename library package to libgdal-grass, drop now obsolete metapackage.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 21 Jan 2017 12:20:20 +0100
+ 
+ libgdal-grass (2.1.3~rc1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * Drop grass72.patch, applied upstream. Refresh remaining patch.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 20 Jan 2017 11:41:22 +0100
+ 
+ libgdal-grass (2.1.2-4) unstable; urgency=medium
+ 
+   * Add patch to link GRASS 7.2 libraries.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 17 Jan 2017 01:50:21 +0100
+ 
+ libgdal-grass (2.1.2-3) unstable; urgency=medium
+ 
+   * Update rpath patch for GRASS 7.2.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 16 Jan 2017 19:15:15 +0100
+ 
+ libgdal-grass (2.1.2-2) unstable; urgency=medium
+ 
+   * Bump minimum GRASS version to 7.2.0.
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 28 Dec 2016 19:46:06 +0100
+ 
+ libgdal-grass (2.1.2-2~exp1) experimental; urgency=medium
+ 
+   * Bump minimum GRASS version to 7.2.0~rc1.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 28 Oct 2016 16:30:08 +0200
+ 
+ libgdal-grass (2.1.2-1) unstable; urgency=medium
+ 
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 28 Oct 2016 00:08:05 +0200
+ 
+ libgdal-grass (2.1.2-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 27 Oct 2016 20:20:08 +0200
+ 
+ libgdal-grass (2.1.2~rc1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 14 Oct 2016 19:40:18 +0200
+ 
+ libgdal-grass (2.1.1-3) unstable; urgency=medium
+ 
+   * Bump minimum GRASS version to 7.0.5.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 02 Oct 2016 22:30:08 +0200
+ 
+ libgdal-grass (2.1.1-2) unstable; urgency=medium
+ 
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 10 Aug 2016 15:02:31 +0200
+ 
+ libgdal-grass (2.1.1-2~exp1) experimental; urgency=medium
+ 
+   * Add metapackage to pull in the version specific binary package.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 06 Aug 2016 23:04:16 +0200
+ 
+ libgdal-grass (2.1.1-1) unstable; urgency=medium
+ 
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 13 Jul 2016 16:30:03 +0200
+ 
+ libgdal-grass (2.1.1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Update watch file to use HTTPS for trac.osgeo.org.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 13 Jul 2016 12:11:01 +0200
+ 
+ libgdal-grass (2.1.1~rc1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * Move control file generation to separate templates target.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 04 Jul 2016 21:56:57 +0200
+ 
+ libgdal-grass (2.1.0-1) unstable; urgency=medium
+ 
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 10 May 2016 14:48:33 +0200
+ 
+ libgdal-grass (2.1.0-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Refresh patches.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 02 May 2016 21:06:30 +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.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 02 Mar 2016 21:34:56 +0100
+ 
+ libgdal-grass (2.0.2-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Drop patches applied upstream, refresh remaining patch.
+   * Bump Standards-Version to 3.9.7, no changes.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 19 Feb 2016 15:55:24 +0100
+ 
 +libgdal-grass (1.11.4-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +  * Bump Standards-Version to 3.9.7, no changes.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sat, 06 Feb 2016 16:16:29 +0100
 +
  libgdal-grass (1.11.3-3) unstable; urgency=medium
  
    * Update Vcs-Git URL to use HTTPS.
diff --cc debian/control
index c884244,876ce30..b4cf7d6
--- a/debian/control
+++ b/debian/control
@@@ -13,15 -13,15 +13,15 @@@ Build-Depends: debhelper (>= 9)
                 libproj-dev,
                 libpq-dev,
                 pkg-config
- Standards-Version: 3.9.7
+ 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 -b experimental-2.1
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git -b experimental
  Homepage: http://www.gdal.org/
  
- Package: libgdal1-1.11.4-grass
+ Package: libgdal-grass
  Architecture: any
  Section: libs
- Depends: grass703,
+ Depends: grass720,
           ${shlibs:Depends},
           ${misc:Depends}
  Recommends: gdal-bin
diff --cc debian/control.in
index a469db2,24874af..16748e1
--- 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.7
+ 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 -b experimental-2.1
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git -b experimental
  Homepage: http://www.gdal.org/
  
- Package: libgdal1-1.11.4-grass
+ Package: libgdal-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



More information about the Pkg-grass-devel mailing list