[Git][debian-gis-team/gdal-grass][master] 22 commits: Update branch in gbp.conf & Vcs-Git URL.
Bas Couwenberg
gitlab at salsa.debian.org
Thu May 24 19:21:33 BST 2018
Bas Couwenberg pushed to branch master at Debian GIS Project / gdal-grass
Commits:
42aa4285 by Bas Couwenberg at 2018-04-21T18:46:14+02:00
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
38270223 by Bas Couwenberg at 2018-04-21T18:48:32+02:00
New upstream version 2.3.0~beta1
- - - - -
8db99fc9 by Bas Couwenberg at 2018-04-21T18:48:33+02:00
Merge tag 'upstream/2.3.0_beta1' into experimental
Upstream version 2.3.0~beta1
- - - - -
32538404 by Bas Couwenberg at 2018-04-22T09:17:37+02:00
New upstream beta release.
- - - - -
4215c4e8 by Bas Couwenberg at 2018-04-22T09:18:18+02:00
Set distribution to experimental.
- - - - -
d5ad8409 by Bas Couwenberg at 2018-05-04T20:17:10+02:00
New upstream version 2.3.0~rc1
- - - - -
8fcb9f43 by Bas Couwenberg at 2018-05-04T20:17:12+02:00
Merge tag 'upstream/2.3.0_rc1' into experimental
Upstream version 2.3.0~rc1
- - - - -
30f19707 by Bas Couwenberg at 2018-05-04T20:17:53+02:00
New upstream release candidate.
- - - - -
8ca51226 by Bas Couwenberg at 2018-05-04T20:29:18+02:00
Enable parallel make.
- - - - -
45bdac01 by Bas Couwenberg at 2018-05-04T20:29:18+02:00
Set distribution to experimental.
- - - - -
24254a38 by Bas Couwenberg at 2018-05-07T14:44:11+02:00
Drop GRASSTABLES_DIR rules, removed in GDAL 2.2.0.
- - - - -
6bb23f8c by Bas Couwenberg at 2018-05-07T14:44:29+02:00
Use dh_auto_install instead of make.
- - - - -
25f090ba by Bas Couwenberg at 2018-05-07T14:52:02+02:00
Strip trailing whitespace from changelog & control files.
- - - - -
bbe10a43 by Bas Couwenberg at 2018-05-07T22:10:07+02:00
Don't use version plugins directory.
- - - - -
dd793e1f by Bas Couwenberg at 2018-05-07T22:10:07+02:00
Set distribution to experimental.
- - - - -
6fe6d29a by Bas Couwenberg at 2018-05-11T12:38:10+02:00
New upstream version 2.3.0
- - - - -
82900884 by Bas Couwenberg at 2018-05-11T12:38:14+02:00
Merge tag 'upstream/2.3.0' into experimental
Upstream version 2.3.0
- - - - -
538fd1ec by Bas Couwenberg at 2018-05-11T12:39:38+02:00
New upstream release.
- - - - -
b93a23f2 by Bas Couwenberg at 2018-05-11T12:40:14+02:00
Set distribution to experimental.
- - - - -
76da5ccf by Bas Couwenberg at 2018-05-11T18:03:14+02:00
Bump minimum GDAL version to 2.3.0.
- - - - -
06c75c53 by Bas Couwenberg at 2018-05-24T18:36:36+02:00
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit 42aa4285479fed5be4f3bcb4d2dc8e6eaed6ee45.
- - - - -
e93ddc48 by Bas Couwenberg at 2018-05-24T18:37:33+02:00
Set distribution to unstable.
- - - - -
11 changed files:
- VERSION
- configure.in
- debian/changelog
- debian/control
- debian/lintian-overrides
- debian/rules
- grass57dataset.cpp
- ogrgrass.h
- ogrgrassdatasource.cpp
- ogrgrassdriver.cpp
- ogrgrasslayer.cpp
Changes:
=====================================
VERSION
=====================================
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.4
+2.3.0
=====================================
configure.in
=====================================
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
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.
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,39 @@
-libgdal-grass (2.2.4-2) UNRELEASED; urgency=medium
+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 at 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 at 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 at 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 at 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 at debian.org> Sat, 31 Mar 2018 11:38:09 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 22 Apr 2018 09:17:58 +0200
libgdal-grass (2.2.4-1) unstable; urgency=medium
@@ -605,4 +634,3 @@ libgdal-grass (1.2.6-1) unstable; urgency=low
* Initial release (Closes: #248832)
-- Steve Halasz <debian at adkgis.org> Mon, 13 Jun 2005 13:00:27 -0400
-
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
d-shlibs,
grass (>= 7.4.0),
grass-dev (>= 7.4.0),
- libgdal-dev (>= 2.2.4),
+ libgdal-dev (>= 2.3.0),
libpq-dev,
pkg-config
Standards-Version: 4.1.4
@@ -31,4 +31,3 @@ Description: GRASS extension for the GDAL library
provides access to GRASS data via GDAL.
.
This package provides the GDAL GRASS plugin.
-
=====================================
debian/lintian-overrides
=====================================
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,4 +1,4 @@
# 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
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,6 @@ 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 +40,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
=====================================
grass57dataset.cpp
=====================================
--- 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
@@ -132,11 +132,11 @@ class GRASSDataset : public GDALDataset
double adfGeoTransform[6];
public:
- GRASSDataset();
- ~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 * );
- virtual ~GRASSRasterBand();
-
- virtual CPLErr IReadBlock( int, int, void * ) override;
- virtual 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;
+ GRASSRasterBand( GRASSDataset *, int, const char *, const char * );
+ ~GRASSRasterBand() override;
+
+ CPLErr IReadBlock( int, int, void * ) override;
+ CPLErr IRasterIO ( GDALRWFlag, int, int, int, int,
+ void *, int, int, GDALDataType,
+ GSpacing nPixelSpace,
+ GSpacing nLineSpace,
+ GDALRasterIOExtraArg* psExtraArg) 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 * );
=====================================
ogrgrass.h
=====================================
--- a/ogrgrass.h
+++ b/ogrgrass.h
@@ -1,5 +1,5 @@
/******************************************************************************
- * $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.
=====================================
ogrgrassdatasource.cpp
=====================================
--- 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
=====================================
ogrgrassdriver.cpp
=====================================
--- 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() */
=====================================
ogrgrasslayer.cpp
=====================================
--- 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 );
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/compare/174fbbfc72389a43cbc2d15980da1dd54c305953...e93ddc48ad15ee8c70bfc6fb058455e6a6a1ec77
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/compare/174fbbfc72389a43cbc2d15980da1dd54c305953...e93ddc48ad15ee8c70bfc6fb058455e6a6a1ec77
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180524/a38e978f/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list