Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/VERSION
+++ b/VERSION
-2.2.3
+2.3.2
--- a/configure.in
+++ b/configure.in
 dnl ***************************************************************************
-dnl $Id: configure.in 37160 2017-01-17 07:34:22Z rouault $
+dnl $Id$
 dnl
 dnl Project:  GDAL GRASS Plugin
 dnl Purpose:  Configure source file.

--- a/debian/changelog
+++ b/debian/changelog
+libgdal-grass (2.3.2-2~bionic1) bionic; urgency=medium
+
+  * Rebuild for bionic.
+  * Bump mininum GRASS version to 7.4.3.
+
+ -- Martin Landa <landa.martin@gmail.com>  Wed, 28 Nov 2018 12:17:52 +0100
+
 libgdal-grass (2.2.3-3~bionic5) bionic; urgency=medium

  * Override dh_gencontrol to set GRASS ABI dependency with substvars.
@@ -18,6 +25,41 @@ libgdal-grass (2.2.3-3~bionic3) bionic; urgency=medium

 -- Martin Landa <landa.martin@gmail.com>  Sun, 28 Oct 2018 11:06:54 +0100

+libgdal-grass (2.3.2-2) unstable; urgency=medium
+
+  * Bump minimum GRASS version to 7.4.2.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 23 Oct 2018 07:47:26 +0200
+
+libgdal-grass (2.3.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 4.2.1, no changes.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 28 Sep 2018 17:31:54 +0200
+
+libgdal-grass (2.3.1-2) unstable; urgency=medium
+
+  * Disable PIE only on older Ubuntu releases.
+  * Bump Standards-Version to 4.1.5, no changes.
+  * Drop autopkgtest to test installability.
+  * Add lintian override for testsuite-autopkgtest-missing.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 31 Jul 2018 15:49:42 +0200
+
+libgdal-grass (2.3.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 28 Jun 2018 11:53:44 +0200
+
+libgdal-grass (2.3.1~rc1-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 23 Jun 2018 12:25:56 +0200
+
 libgdal-grass (2.2.3-3~bionic2) bionic; urgency=medium

  * Rebuild for bionic.
@@ -37,6 +79,59 @@ libgdal-grass (2.2.2-1~xenial5) xenial; urgency=medium

 -- Martin Landa <landa.martin@gmail.com>  Thu, 14 Jun 2018 00:06:51 +0200

+libgdal-grass (2.3.0-1) unstable; urgency=medium
+
+  * Bump minimum GDAL version to 2.3.0.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 24 May 2018 18:37:15 +0200
+
+libgdal-grass (2.3.0-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 11 May 2018 12:40:00 +0200
+
+libgdal-grass (2.3.0~rc1-1~exp2) experimental; urgency=medium
+
+  * Drop GRASSTABLES_DIR rules, removed in GDAL 2.2.0.
+  * Strip trailing whitespace from changelog & control files.
+  * Don't use version plugins directory.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Mon, 07 May 2018 19:08:06 +0200
+
+libgdal-grass (2.3.0~rc1-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Enable parallel make.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 04 May 2018 20:18:15 +0200
+
+libgdal-grass (2.3.0~beta1-1~exp1) experimental; urgency=medium
+
+  * New upstream beta release.
+  * Update Vcs-* URLs for Salsa.
+  * Drop override for vcs-deprecated-in-debian-infrastructure.
+  * Bump Standards-Version to 4.1.4, no changes.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 22 Apr 2018 09:17:58 +0200
+
+libgdal-grass (2.2.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Add lintian override for vcs-deprecated-in-debian-infrastructure.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 21 Mar 2018 16:24:30 +0100
+
+libgdal-grass (2.2.3-2) unstable; urgency=medium
+
+  * Update copyright-format URL to use HTTPS.
+  * Bump minimum GRASS version to 7.4.0.
+  * Update rpath patch for GRASS 7.4.
+  * Bump Standards-Version to 4.1.3, no changes.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 26 Jan 2018 11:39:22 +0100
+
 libgdal-grass (2.2.2-1~xenial4) xenial; urgency=medium

  * Rebuild for xenial.
@@ -44,6 +139,14 @@ libgdal-grass (2.2.2-1~xenial4) xenial; urgency=medium

 -- Martin Landa <landa.martin@gmail.com>  Sat, 27 Jan 2018 11:50:25 +0100

+libgdal-grass (2.3.0-2) unstable; urgency=medium
+
+  * Explicitly disable --as-needed on Ubuntu.
+    See: https://trac.osgeo.org/osgeolive/ticket/2068
+  * Bump minimum GRASS version to 7.4.1.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 12 Jun 2018 23:12:26 +0200
+
 libgdal-grass (2.2.2-1~xenial3) xenial; urgency=medium

  * Rebuild for xenial.
@@ -51,6 +154,22 @@ libgdal-grass (2.2.2-1~xenial3) xenial; urgency=medium

 -- Martin Landa <landa.martin@gmail.com>  Fri, 12 Jan 2018 13:36:15 +0100

+libgdal-grass (2.2.3-1) unstable; urgency=medium
+
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 17 Dec 2017 12:38:42 +0100
+
+libgdal-grass (2.2.3-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+  * Drop libproj-dev from build dependencies, not directly required and
+    already pulled in via libgdal-dev.
+  * Revert changes for GRASS 7.4 to build with GRASS 7.2.
+  * Bump Standards-Version to 4.1.2, no changes.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 15 Dec 2017 19:38:15 +0100
+
 libgdal-grass (2.2.2-1~xenial2) xenial; urgency=medium

  * Rebuild for xenial.
@@ -65,6 +184,20 @@ libgdal-grass (2.2.2-1~xenial1) xenial; urgency=medium

 -- Martin Landa <landa.martin@gmail.com>  Sun, 19 Nov 2017 22:19:30 +0100

+libgdal-grass (2.2.2-2~exp2) experimental; urgency=medium
+
+  * Update rpath patch for GRASS 7.4.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 17 Nov 2017 17:57:21 +0100
+
+libgdal-grass (2.2.2-2~exp1) experimental; urgency=medium
+
+  * Override dh_gencontrol to set GRASS ABI dependency with substvars.
+  * Strip trailing whitespace from changelog & rules.
+  * Bump minimum GRASS version to 7.4.0~.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 17 Nov 2017 14:07:10 +0100
+
 libgdal-grass (2.2.2-1) unstable; urgency=medium

  * Bump Standards-Version to 4.1.1, no changes.
@@ -493,4 +626,3 @@ libgdal-grass (1.2.6-1) unstable; urgency=low
  * Initial release (Closes: #248832)

 -- Steve Halasz <debian@adkgis.org>  Mon, 13 Jun 2005 13:00:27 -0400
-
--- a/debian/control
+++ b/debian/control
@@ -7,15 +7,15 @@ Priority: optional
 Build-Depends: debhelper (>= 9),
               dh-autoreconf,
               d-shlibs,
-               grass (>= 7.4.2),
-               grass-dev (>= 7.4.2),
-               libgdal-dev (>= 2.2.3),
-               libproj-dev,
+               grass (>= 7.4.3),
+               grass-dev (>= 7.4.3),
+               libgdal-dev (>= 2.3.2),
               libpq-dev,
+               lsb-release,
               pkg-config
-Standards-Version: 4.1.1
-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 ubuntu/bionic
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/gdal-grass
+Vcs-Git: https://salsa.debian.org/debian-gis-team/gdal-grass.git -b ubuntu/bionic
 Homepage: http://www.gdal.org/

 Package: libgdal-grass

--- a/debian/copyright
+++ b/debian/copyright
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: GDAL-GRASS
 Upstream-Contact: Frank Warmerdam <warmerdam@pobox.com>,
 Radim Blazek <radim.blazek@gmail.com>

--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
 # The run path has been added to get GRASS internal library
-libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/*/gdal_GRASS.so /usr/lib/grass*/lib
-libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/*/ogr_GRASS.so /usr/lib/grass*/lib
+libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/gdal_GRASS.so /usr/lib/grass*/lib
+libgdal-grass: binary-or-shlib-defines-rpath usr/lib/gdalplugins/ogr_GRASS.so /usr/lib/grass*/lib

--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,18 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all

 # Disable PIE on Ubuntu where it's still problematic
 VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo yes)
+DISTRIBUTION_RELEASE       := $(shell lsb_release -cs)

 ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
+  ifneq (,$(filter $(DISTRIBUTION_RELEASE),trusty xenial bionic))
    export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
  endif
+  export DEB_LDFLAGS_MAINT_APPEND=-Wl,--no-as-needed
+endif

 PKGNAME=$(shell grep Package: debian/control | head -1 | cut -d' ' -f2)
 GRASS=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2))
 GRASS_ABI=grass$(subst .,,$(shell pkg-config --modversion grass | cut -d. -f1,2,3 | sed -e 's/RC/-/'))
-GDAL=$(shell cat VERSION | cut -d. -f1,2)

 %:
 	dh $@ --with autoreconf --parallel
@@ -41,18 +44,12 @@ override_dh_auto_configure:

 	dh_auto_configure -- \
 	                  --prefix=/usr \
-	                  --with-autoload=/usr/lib/gdalplugins/$(GDAL) \
+	                  --with-autoload=/usr/lib/gdalplugins \
 	                  --with-grass=/usr/lib/$(GRASS) \
 	                  --with-postgres-includes=$(shell pg_config --includedir)

 override_dh_auto_install:
-	mkdir -p $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass
-
-	$(MAKE) install AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdalplugins/$(GDAL) \
-			GRASSTABLES_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)/grass
-
-	# removes redundant stuff already installed by grass
-	rm -rf $(CURDIR)/debian/$(PKGNAME)/usr/lib/$(GDAL)
+	dh_auto_install -- AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdalplugins

 override_dh_shlibdeps:
 	dh_shlibdeps -l.:/usr/lib/$(GRASS)/lib

--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
+# Not worth the effort
+testsuite-autopkgtest-missing
+
--- a/debian/tests/control
+++ b/debian/tests/control
-# Test installability
-Depends: @
-Test-Command: /bin/true
--- a/grass57dataset.cpp
+++ b/grass57dataset.cpp
@@ -63,7 +63,7 @@ char *GPJ_grass_to_wkt( struct Key_Value *,

 #define GRASS_MAX_COLORS 100000  // what is the right value

-CPL_CVSID("$Id: grass57dataset.cpp 37964 2017-04-11 18:04:50Z rouault $");
+CPL_CVSID("$Id: grass57dataset.cpp c4d5cfef28c1c6fbb03a9ab1d42835e6cfa920cc 2017-12-20 12:29:27Z Kurt Schwehr $")

 #if GRASS_VERSION_MAJOR  >= 7
 #define G_get_cellhd             Rast_get_cellhd
@@ -133,10 +133,10 @@ class GRASSDataset : public GDALDataset

  public:
    GRASSDataset();
-                 ~GRASSDataset();
+    ~GRASSDataset() override;

-    virtual const char *GetProjectionRef(void) override;
-    virtual CPLErr GetGeoTransform( double * ) override;
+    const char *GetProjectionRef(void) override;
+    CPLErr GetGeoTransform( double * ) override;

    static GDALDataset *Open( GDALOpenInfo * );

@@ -174,21 +174,20 @@ class GRASSRasterBand : public GDALRasterBand
    bool        valid;

  public:
+    GRASSRasterBand( GRASSDataset *, int, const char *, const char * );
+    ~GRASSRasterBand() override;

-                   GRASSRasterBand( GRASSDataset *, int,
-                                    const char *, const char * );
-    virtual        ~GRASSRasterBand();
-
-    virtual CPLErr IReadBlock( int, int, void * ) override;
-    virtual CPLErr IRasterIO ( GDALRWFlag, int, int, int, int, void *, int, int, GDALDataType,
+    CPLErr IReadBlock( int, int, void * ) override;
+    CPLErr IRasterIO ( GDALRWFlag, int, int, int, int,
+                       void *, int, int, GDALDataType,
                       GSpacing nPixelSpace,
                       GSpacing nLineSpace,
                       GDALRasterIOExtraArg* psExtraArg) override;
-    virtual GDALColorInterp GetColorInterpretation() override;
-    virtual GDALColorTable *GetColorTable() override;
-    virtual double GetMinimum( int *pbSuccess = NULL ) override;
-    virtual double GetMaximum( int *pbSuccess = NULL ) override;
-    virtual double GetNoDataValue( int *pbSuccess = NULL ) override;
+    GDALColorInterp GetColorInterpretation() override;
+    GDALColorTable *GetColorTable() override;
+    double GetMinimum( int *pbSuccess = NULL ) override;
+    double GetMaximum( int *pbSuccess = NULL ) override;
+    double GetNoDataValue( int *pbSuccess = NULL ) override;

  private:
    CPLErr ResetReading( struct Cell_head * );

--- a/ogrgrass.h
+++ b/ogrgrass.h
 /******************************************************************************
- * $Id: ogrgrass.h 36501 2016-11-25 14:09:24Z rouault $
+ * $Id: ogrgrass.h 2c3d60220a2d6b41496ded571e231b96435bffa0 2016-11-25 14:09:24Z Even Rouault $
 *
 * Project:  OpenGIS Simple Features Reference Implementation
 * Purpose:  Private definitions for OGR/GRASS driver.

--- a/ogrgrassdatasource.cpp
+++ b/ogrgrassdatasource.cpp
@@ -31,7 +31,7 @@
 #include "cpl_conv.h"
 #include "cpl_string.h"

-CPL_CVSID("$Id: ogrgrassdatasource.cpp 36368 2016-11-21 01:47:49Z rouault $");
+CPL_CVSID("$Id: ogrgrassdatasource.cpp ff8146d84de7cba8e09d212d5481ea7d2ede3e98 2017-06-27 20:47:31Z Even Rouault $")

 #if GRASS_VERSION_MAJOR  >= 7
 #define G__setenv                G_setenv_nogisrc

--- a/ogrgrassdriver.cpp
+++ b/ogrgrassdriver.cpp
@@ -30,7 +30,7 @@
 #include "cpl_conv.h"
 #include "cpl_string.h"

-CPL_CVSID("$Id: ogrgrassdriver.cpp 36368 2016-11-21 01:47:49Z rouault $");
+CPL_CVSID("$Id: ogrgrassdriver.cpp ff8146d84de7cba8e09d212d5481ea7d2ede3e98 2017-06-27 20:47:31Z Even Rouault $")

 /************************************************************************/
 /*                          ~OGRGRASSDriver()                           */

--- a/ogrgrasslayer.cpp
+++ b/ogrgrasslayer.cpp
@@ -31,7 +31,7 @@
 #include "ogrgrass.h"
 #include "cpl_conv.h"

-CPL_CVSID("$Id: ogrgrasslayer.cpp 36368 2016-11-21 01:47:49Z rouault $");
+CPL_CVSID("$Id: ogrgrasslayer.cpp 4971449609881d6ffdca70188292293852d12691 2017-12-17 16:48:14Z Even Rouault $")

 /************************************************************************/
 /*                           OGRGRASSLayer()                            */
@@ -789,11 +789,9 @@ OGRFeature *OGRGRASSLayer::GetFeature( GIntBig nFeatureId )
               nFeatureId );

    int cat;
-    OGRFeature *poFeature = NULL;
-
    OGRGeometry *poOGR = GetFeatureGeometry ( nFeatureId, &cat );

-    poFeature = new OGRFeature( poFeatureDefn );
+    OGRFeature* poFeature = new OGRFeature( poFeatureDefn );
    poFeature->SetGeometryDirectly( poOGR );
    poFeature->SetFID ( nFeatureId );