diff -Nru libgdal-grass-2.4.2/debian/changelog libgdal-grass-3.0.4/debian/changelog --- libgdal-grass-2.4.2/debian/changelog 2019-09-07 19:26:06.000000000 +0000 +++ libgdal-grass-3.0.4/debian/changelog 2021-10-16 07:22:21.000000000 +0000 @@ -1,9 +1,143 @@ +libgdal-grass (3.0.4-1~bionic4) bionic; urgency=medium + + * Rebuild for bionic. + * Bump GRASS GIS version to 7.8.6 + + -- Martin Landa Sat, 16 Oct 2021 09:22:21 +0200 + +libgdal-grass (3.0.4-1~bionic3) bionic; urgency=medium + + * Rebuild for bionic. + + -- Martin Landa Wed, 23 Dec 2020 16:13:04 +0100 + +libgdal-grass (3.0.4-1~bionic2) bionic; urgency=medium + + * Rebuild for bionic. + + -- Martin Landa Mon, 05 Oct 2020 20:43:38 +0200 + +libgdal-grass (3.0.4-1~bionic1) bionic; urgency=medium + + * Rebuild for bionic. + + -- Martin Landa Wed, 06 May 2020 21:47:10 +0200 + +libgdal-grass (3.0.4-1) unstable; urgency=medium + + * New upstream release. + * Move from experimental to unstable. + + -- Bas Couwenberg Thu, 30 Jan 2020 14:31:58 +0100 + +libgdal-grass (3.0.4~rc1-1~exp1) experimental; urgency=medium + + * New upstream release candidate. + * Bump Standards-Version to 4.5.0, no changes. + + -- Bas Couwenberg Tue, 28 Jan 2020 12:03:04 +0100 + +libgdal-grass (3.0.3-1) unstable; urgency=medium + + * New upstream release. + * Move from experimental to unstable. + + -- Bas Couwenberg Mon, 13 Jan 2020 14:57:26 +0100 + +libgdal-grass (3.0.3~rc1-1~exp1) experimental; urgency=medium + + * New upstream release candidate. + + -- Bas Couwenberg Wed, 08 Jan 2020 15:32:12 +0100 + +libgdal-grass (3.0.2-1) unstable; urgency=medium + + * Move from experimental to unstable. + + -- Bas Couwenberg Wed, 08 Jan 2020 05:55:31 +0100 + +libgdal-grass (3.0.2-1~exp3) experimental; urgency=medium + + * Update packaging for GRASS 7.8.2. + + -- Bas Couwenberg Tue, 24 Dec 2019 20:39:58 +0100 + +libgdal-grass (2.4.3-3) unstable; urgency=medium + + * Update packaging for GRASS 7.8.2. + + -- Bas Couwenberg Tue, 24 Dec 2019 20:39:46 +0100 + +libgdal-grass (3.0.2-1~bionic1) bionic; urgency=medium + + * Rebuild for bionic. + * Update packaging for GRASS 7.8.2. + + -- Martin Landa Fri, 13 Dec 2019 10:21:57 +0100 + +libgdal-grass (2.4.2-2~bionic2) bionic; urgency=medium + + * Rebuild for bionic. + * Update packaging for GRASS 7.8.1. + + -- Martin Landa Sun, 10 Nov 2019 23:48:04 +0100 + +libgdal-grass (3.0.2-1~exp2) experimental; urgency=medium + + * Update packaging for GRASS 7.8.1. + + -- Bas Couwenberg Sat, 09 Nov 2019 13:44:57 +0100 + +libgdal-grass (2.4.3-2) unstable; urgency=medium + + * Update packaging for GRASS 7.8.1. + + -- Bas Couwenberg Sat, 09 Nov 2019 13:31:58 +0100 + +libgdal-grass (3.0.2-1~exp1) experimental; urgency=medium + + * New upstream release. + + -- Bas Couwenberg Mon, 04 Nov 2019 14:46:20 +0100 + +libgdal-grass (2.4.3-1) unstable; urgency=medium + + * New upstream release. + * Bump Standards-Version to 4.4.1, no changes. + + -- Bas Couwenberg Mon, 04 Nov 2019 14:02:42 +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 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 Sun, 08 Sep 2019 22:27:30 +0200 + +libgdal-grass (2.4.2-3) unstable; urgency=medium + + * Disable as-needed linking on Debian too, gcc-9 enables it by default. + + -- Bas Couwenberg Sun, 08 Sep 2019 22:21:39 +0200 + libgdal-grass (2.4.2-2~bionic1) bionic; urgency=medium * Rebuild for bionic. -- Martin Landa 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 Sat, 07 Sep 2019 10:26:07 +0200 + libgdal-grass (2.4.2-2) unstable; urgency=medium * Update packaging for GRASS 7.8.0. @@ -13,6 +147,16 @@ -- Bas Couwenberg 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 Sat, 31 Aug 2019 09:09:43 +0200 + libgdal-grass (2.4.2-1) unstable; urgency=medium * New upstream release. diff -Nru libgdal-grass-2.4.2/debian/control libgdal-grass-3.0.4/debian/control --- libgdal-grass-2.4.2/debian/control 2019-09-07 19:26:06.000000000 +0000 +++ libgdal-grass-3.0.4/debian/control 2021-10-16 07:22:00.000000000 +0000 @@ -7,13 +7,13 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, d-shlibs, - grass (>= 7.8.0), - grass-dev (>= 7.8.0), - libgdal-dev (>= 2.4.2), + grass (>= 7.8.6), + grass-dev (>= 7.8.6), + libgdal-dev (>= 3.0.4), libpq-dev, lsb-release, pkg-config -Standards-Version: 4.4.0 +Standards-Version: 4.5.0 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/ diff -Nru libgdal-grass-2.4.2/debian/rules libgdal-grass-3.0.4/debian/rules --- libgdal-grass-2.4.2/debian/rules 2019-09-07 19:26:06.000000000 +0000 +++ libgdal-grass-3.0.4/debian/rules 2021-10-16 07:21:28.000000000 +0000 @@ -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 @@ 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) diff -Nru libgdal-grass-2.4.2/grass57dataset.cpp libgdal-grass-3.0.4/grass57dataset.cpp --- libgdal-grass-2.4.2/grass57dataset.cpp 2019-07-07 12:21:17.000000000 +0000 +++ libgdal-grass-3.0.4/grass57dataset.cpp 2020-01-28 11:01:41.000000000 +0000 @@ -63,7 +63,7 @@ #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 @@ 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 @@ /* GetProjectionRef() */ /************************************************************************/ -const char *GRASSDataset::GetProjectionRef() +const char *GRASSDataset::_GetProjectionRef() { if( pszProjection == NULL ) return ""; diff -Nru libgdal-grass-2.4.2/ogrgrasslayer.cpp libgdal-grass-3.0.4/ogrgrasslayer.cpp --- libgdal-grass-2.4.2/ogrgrasslayer.cpp 2019-07-07 12:21:17.000000000 +0000 +++ libgdal-grass-3.0.4/ogrgrasslayer.cpp 2020-01-28 11:01:41.000000000 +0000 @@ -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 @@ if ( srsWkt ) { poSRS = new OGRSpatialReference ( srsWkt ); + poSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER); G_free ( srsWkt ); } diff -Nru libgdal-grass-2.4.2/VERSION libgdal-grass-3.0.4/VERSION --- libgdal-grass-2.4.2/VERSION 2019-07-07 12:21:17.000000000 +0000 +++ libgdal-grass-3.0.4/VERSION 2020-01-28 11:01:41.000000000 +0000 @@ -1 +1 @@ -2.4.2 +3.0.4