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

Bas Couwenberg sebastic at debian.org
Mon Jul 10 18:44:42 UTC 2017


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

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

commit 0dd596ff7a077d9a275d57e7eb3623150d7a1034
Merge: 89d602b e44027e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jul 10 18:29:50 2017 +0200

    Merge branch 'experimental-2.2'

 Makefile.in                  |  13 -
 README                       |  18 +-
 VERSION                      |   2 +-
 aclocal.m4                   |  16 +-
 configure                    |  70 +++-
 configure.in                 |  15 +-
 debian/changelog             |  67 ++++
 debian/control               |  17 +-
 debian/control.in            |  17 +-
 debian/gbp.conf              |   4 +-
 debian/lintian-overrides     |   4 +-
 debian/lintian-overrides.in  |   4 -
 debian/patches/grass72.patch |  31 --
 debian/patches/rpath         |   2 +-
 debian/patches/series        |   1 -
 debian/rules                 |   7 +
 grass57dataset.cpp           | 462 +++++++++++-----------
 ogrgrass.h                   | 137 +++----
 ogrgrassdatasource.cpp       |  75 ++--
 ogrgrassdriver.cpp           |  33 +-
 ogrgrasslayer.cpp            | 886 +++++++++++++++++++++----------------------
 21 files changed, 930 insertions(+), 951 deletions(-)

diff --cc debian/changelog
index a130431,98c958a..d209efa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,63 +1,71 @@@
+ libgdal-grass (2.2.1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 30 Jun 2017 15:04:00 +0200
+ 
+ libgdal-grass (2.2.1~rc1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * Disable PIE on Ubuntu where it's still problematic.
+   * Bump Standards-Version to 4.0.0, no changes.
+   * Add autopkgtest to test installability.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 23 Jun 2017 17:07:35 +0200
+ 
+ libgdal-grass (2.2.0-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Bump minimum GRASS version to 7.2.1.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 09 May 2017 18:23:57 +0200
+ 
+ libgdal-grass (2.2.0~beta1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream beta release.
+   * Drop Breaks/Replaces for old binary packages, 2.2 subdirectory now used.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 15 Apr 2017 12:17:42 +0200
+ 
+ libgdal-grass (2.1.3-1~exp2) experimental; urgency=medium
+ 
+   * Merge changes from libgdal-grass (2.1.2-5).
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 03 Apr 2017 01:22:02 +0200
+ 
+ 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-6) unstable; urgency=medium
 +
 +  * Bump minimum GRASS version to 7.2.1.
 +  * Bump Standards-Version to 4.0.0, no changes.
 +  * Add autopkgtest to test installability.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sun, 18 Jun 2017 19:46:34 +0200
 +
  libgdal-grass (2.1.2-5) unstable; urgency=medium
  
    * Enable PIE hardening flags.
diff --cc debian/control
index 2b641ce,3fac168..667f550
--- a/debian/control
+++ b/debian/control
@@@ -15,10 -15,10 +15,10 @@@ Build-Depends: debhelper (>= 9)
                 pkg-config
  Standards-Version: 4.0.0
  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.2
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git
  Homepage: http://www.gdal.org/
  
- Package: libgdal20-2.1.2-grass
+ Package: libgdal-grass
  Architecture: any
  Section: libs
  Depends: grass721,
diff --cc debian/control.in
index a293e36,eb84a6b..b912152
--- a/debian/control.in
+++ b/debian/control.in
@@@ -15,10 -15,10 +15,10 @@@ Build-Depends: debhelper (>= 9)
                 pkg-config
  Standards-Version: 4.0.0
  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.2
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gdal-grass.git
  Homepage: http://www.gdal.org/
  
- Package: libgdal20-2.1.2-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