Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/VERSION
+++ b/VERSION
-2.2.3
+2.3.0
--- 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.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.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.

--- a/debian/control
+++ b/debian/control
@@ -7,14 +7,14 @@ Priority: optional
 Build-Depends: debhelper (>= 9),
               dh-autoreconf,
               d-shlibs,
-               grass (>= 7.2.2),
-               grass-dev (>= 7.2.2),
-               libgdal-dev (>= 2.2.3),
+               grass (>= 7.4.0),
+               grass-dev (>= 7.4.0),
+               libgdal-dev (>= 2.3.0~),
               libpq-dev,
               pkg-config
-Standards-Version: 4.1.2
-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
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/gdal-grass
+Vcs-Git: https://salsa.debian.org/debian-gis-team/gdal-grass.git -b experimental
 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/patches/rpath
+++ b/debian/patches/rpath
@@ -9,11 +9,11 @@ Forwarded: not-needed
 
 $(GLIBNAME):	grass57dataset.o
 -	$(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME)
-+	$(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass72/lib
+	$(LD_SHARED) $(LDFLAGS) grass57dataset.o $(LIBS) -o $(GLIBNAME) -Wl,-rpath,/usr/lib/grass74/lib
 
 $(OLIBNAME):	ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o
 -	$(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME)
-+	$(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass72/lib
+	$(LD_SHARED) $(LDFLAGS) ogrgrassdriver.o ogrgrassdatasource.o ogrgrasslayer.o $(LIBS) -o $(OLIBNAME) -Wl,-rpath,/usr/lib/grass74/lib
 
 %.o:	%.cpp
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
--- 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 );