Skip to content
Commits on Source (41)
libgdal-grass (3.0.2-1~bionic1) bionic; urgency=medium
* Rebuild for bionic.
* Update packaging for GRASS 7.8.2.
-- Martin Landa <landa.martin@gmail.com> Fri, 13 Dec 2019 10:21:57 +0100
libgdal-grass (2.4.2-2~bionic2) bionic; urgency=medium
* Rebuild for bionic.
......@@ -5,12 +12,37 @@ libgdal-grass (2.4.2-2~bionic2) bionic; urgency=medium
-- Martin Landa <landa.martin@gmail.com> Sun, 10 Nov 2019 23:48:04 +0100
libgdal-grass (3.0.2-1~exp1) experimental; urgency=medium
* New upstream release.
-- Bas Couwenberg <sebastic@debian.org> Mon, 04 Nov 2019 14:46:20 +0100
libgdal-grass (3.0.2~rc1-1~exp1) experimental; urgency=medium
* New upstream release candidate.
* Bump Standards-Version to 4.4.1, no changes.
-- Bas Couwenberg <sebastic@debian.org> Mon, 28 Oct 2019 15:49:03 +0100
libgdal-grass (3.0.1-1~exp3) experimental; urgency=medium
* Disable as-needed linking on Debian too, gcc-9 enables it by default.
-- Bas Couwenberg <sebastic@debian.org> Sun, 08 Sep 2019 22:27:30 +0200
libgdal-grass (2.4.2-2~bionic1) bionic; urgency=medium
* Rebuild for bionic.
-- Martin Landa <landa.martin@gmail.com> Sat, 07 Sep 2019 21:26:06 +0200
libgdal-grass (3.0.1-1~exp2) experimental; urgency=medium
* Update packaging for GRASS 7.8.0.
-- Bas Couwenberg <sebastic@debian.org> Sat, 07 Sep 2019 10:26:07 +0200
libgdal-grass (2.4.2-2) unstable; urgency=medium
* Update packaging for GRASS 7.8.0.
......@@ -20,6 +52,16 @@ libgdal-grass (2.4.2-2) unstable; urgency=medium
-- Bas Couwenberg <sebastic@debian.org> Sat, 07 Sep 2019 10:11:51 +0200
libgdal-grass (3.0.1-1~exp1) experimental; urgency=medium
* New upstream release.
* Update watch file to check version directories.
* Update gbp.conf to use --source-only-changes by default.
* Bump Standards-Version to 4.4.0, no changes.
* Update PIE hardening conditional, trusty is EOL.
-- Bas Couwenberg <sebastic@debian.org> Sat, 31 Aug 2019 09:09:43 +0200
libgdal-grass (2.4.2-1) unstable; urgency=medium
* New upstream release.
......
......@@ -7,13 +7,13 @@ Priority: optional
Build-Depends: debhelper (>= 9),
dh-autoreconf,
d-shlibs,
grass (>= 7.8.1),
grass-dev (>= 7.8.1),
libgdal-dev (>= 2.4.2),
grass (>= 7.8.2),
grass-dev (>= 7.8.2),
libgdal-dev (>= 3.0.2),
libpq-dev,
lsb-release,
pkg-config
Standards-Version: 4.4.0
Standards-Version: 4.4.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/
......
......@@ -7,6 +7,9 @@
# Enable hardening build flags
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
# Don't link with as-needed to prevent missing libraries
export DEB_LDFLAGS_MAINT_APPEND=-Wl,--no-as-needed
# 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)
......@@ -15,7 +18,6 @@ ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
ifneq (,$(filter $(DISTRIBUTION_RELEASE),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)
......
......@@ -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 c4d5cfef28c1c6fbb03a9ab1d42835e6cfa920cc 2017-12-20 12:29:27Z Kurt Schwehr $")
CPL_CVSID("$Id: grass57dataset.cpp 8e5eeb35bf76390e3134a4ea7076dab7d478ea0e 2018-11-14 22:55:13 +0100 Even Rouault $")
#if GRASS_VERSION_MAJOR >= 7
#define G_get_cellhd Rast_get_cellhd
......@@ -135,7 +135,10 @@ class GRASSDataset : public GDALDataset
GRASSDataset();
~GRASSDataset() override;
const char *GetProjectionRef(void) override;
const char *_GetProjectionRef(void) override;
const OGRSpatialReference* GetSpatialRef() const override {
return GetSpatialRefFromOldGetProjectionRef();
}
CPLErr GetGeoTransform( double * ) override;
static GDALDataset *Open( GDALOpenInfo * );
......@@ -761,7 +764,7 @@ GRASSDataset::~GRASSDataset()
/* GetProjectionRef() */
/************************************************************************/
const char *GRASSDataset::GetProjectionRef()
const char *GRASSDataset::_GetProjectionRef()
{
if( pszProjection == NULL )
return "";
......
......@@ -31,7 +31,7 @@
#include "ogrgrass.h"
#include "cpl_conv.h"
CPL_CVSID("$Id: ogrgrasslayer.cpp 4971449609881d6ffdca70188292293852d12691 2017-12-17 16:48:14Z Even Rouault $")
CPL_CVSID("$Id: ogrgrasslayer.cpp 8e5eeb35bf76390e3134a4ea7076dab7d478ea0e 2018-11-14 22:55:13 +0100 Even Rouault $")
/************************************************************************/
/* OGRGRASSLayer() */
......@@ -213,6 +213,7 @@ OGRGRASSLayer::OGRGRASSLayer( int layerIndex, struct Map_info * map )
if ( srsWkt )
{
poSRS = new OGRSpatialReference ( srsWkt );
poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
G_free ( srsWkt );
}
......