[Git][debian-gis-team/gdal-grass][ubuntu/bionic] 41 commits: New upstream version 2.5.0~beta1
Martin Landa
gitlab at salsa.debian.org
Fri Dec 13 09:26:23 GMT 2019
Martin Landa pushed to branch ubuntu/bionic at Debian GIS Project / gdal-grass
Commits:
ad76b7aa by Bas Couwenberg at 2019-04-20T07:25:05Z
New upstream version 2.5.0~beta1
- - - - -
bd8bc453 by Bas Couwenberg at 2019-04-20T07:25:06Z
Merge tag 'upstream/2.5.0_beta1' into experimental
Upstream version 2.5.0~beta1
- - - - -
7d2360fc by Bas Couwenberg at 2019-04-20T07:25:23Z
New upstream beta release.
- - - - -
796b4223 by Bas Couwenberg at 2019-04-20T07:31:30Z
Require at least libgdal-dev 2.5.0~.
- - - - -
1e277286 by Bas Couwenberg at 2019-04-26T16:01:15Z
New upstream version 2.5.0~rc1
- - - - -
a5d01b66 by Bas Couwenberg at 2019-04-26T16:01:16Z
Merge tag 'upstream/2.5.0_rc1' into experimental
Upstream version 2.5.0~rc1
- - - - -
5597f963 by Bas Couwenberg at 2019-04-26T16:01:38Z
New upstream release candidate.
- - - - -
877d8f81 by Bas Couwenberg at 2019-05-02T07:55:35Z
Update watch file to check version directories.
- - - - -
e5580420 by Bas Couwenberg at 2019-05-02T17:33:08Z
New upstream version 3.0.0~rc1
- - - - -
357de006 by Bas Couwenberg at 2019-05-02T17:33:09Z
Merge tag 'upstream/3.0.0_rc1' into experimental
Upstream version 3.0.0~rc1
- - - - -
0ff64207 by Bas Couwenberg at 2019-05-02T17:33:53Z
New upstream release candidate.
- - - - -
f9052f19 by Bas Couwenberg at 2019-05-05T10:50:03Z
New upstream version 3.0.0~rc2
- - - - -
7ffadeef by Bas Couwenberg at 2019-05-05T10:50:04Z
Merge tag 'upstream/3.0.0_rc2' into experimental
Upstream version 3.0.0~rc2
- - - - -
8a387b57 by Bas Couwenberg at 2019-05-05T10:50:29Z
New upstream release candidate.
- - - - -
0e4e5fa9 by Bas Couwenberg at 2019-05-09T11:32:13Z
New upstream version 3.0.0
- - - - -
d57e2ff2 by Bas Couwenberg at 2019-05-09T11:32:16Z
Merge tag 'upstream/3.0.0' into experimental
Upstream version 3.0.0
- - - - -
254d2fcf by Bas Couwenberg at 2019-05-09T11:32:41Z
New upstream release.
- - - - -
a2570f41 by Bas Couwenberg at 2019-06-28T12:51:26Z
New upstream version 3.0.1~rc1
- - - - -
48eeb69d by Bas Couwenberg at 2019-06-28T12:51:27Z
Merge tag 'upstream/3.0.1_rc1' into experimental
Upstream version 3.0.1~rc1
- - - - -
e358039f by Bas Couwenberg at 2019-06-28T12:52:02Z
New upstream release candidate.
- - - - -
7a5881b8 by Bas Couwenberg at 2019-07-05T11:10:00Z
Update upstream source from tag 'upstream/3.0.1'
Update to upstream version '3.0.1'
with Debian dir a54cc6e6207180b6975914d92c3293cf0eabc02c
- - - - -
be8cda39 by Bas Couwenberg at 2019-07-05T11:10:00Z
New upstream version 3.0.1
- - - - -
8ec488d3 by Bas Couwenberg at 2019-07-05T11:10:38Z
New upstream release.
- - - - -
cda8d35b by Bas Couwenberg at 2019-07-07T06:03:51Z
Update gbp.conf to use --source-only-changes by default.
- - - - -
b28fce9c by Bas Couwenberg at 2019-07-10T15:58:51Z
Bump Standards-Version to 4.4.0, no changes.
- - - - -
62079b61 by Bas Couwenberg at 2019-07-16T11:48:38Z
Update PIE hardening conditional, trusty is EOL.
- - - - -
c80e71b8 by Bas Couwenberg at 2019-08-31T07:09:59Z
Set distribution to experimental.
- - - - -
2a4b1724 by Bas Couwenberg at 2019-09-07T07:33:52Z
Update packaging for GRASS 7.8.0.
- - - - -
8d42e1a0 by Bas Couwenberg at 2019-09-07T08:26:26Z
Set distribution to experimental.
- - - - -
551e548c by Bas Couwenberg at 2019-09-08T20:23:00Z
Disable as-needed linking on Debian too, gcc-9 enables it by default.
- - - - -
50ec7fba by Bas Couwenberg at 2019-09-08T20:27:39Z
Set distribution to experimental.
- - - - -
a2c41a58 by Bas Couwenberg at 2019-09-30T16:58:05Z
Bump Standards-Version to 4.4.1, no changes.
- - - - -
589c8b65 by Bas Couwenberg at 2019-10-28T13:42:43Z
New upstream version 3.0.2~rc1
- - - - -
ea2c9417 by Bas Couwenberg at 2019-10-28T13:42:44Z
Update upstream source from tag 'upstream/3.0.2_rc1'
Update to upstream version '3.0.2~rc1'
with Debian dir f634ed584e6774cdeb3c592b6385a86d656e925f
- - - - -
fc0c51d3 by Bas Couwenberg at 2019-10-28T13:43:32Z
New upstream release candidate.
- - - - -
7344b533 by Bas Couwenberg at 2019-10-28T14:49:16Z
Set distribution to experimental.
- - - - -
04ad7698 by Bas Couwenberg at 2019-11-04T13:27:49Z
New upstream version 3.0.2
- - - - -
2509b1d0 by Bas Couwenberg at 2019-11-04T13:27:50Z
Update upstream source from tag 'upstream/3.0.2'
Update to upstream version '3.0.2'
with Debian dir 3bc3585ae88920bd0a8a838ae484f5bd43ddfb41
- - - - -
c0cf79f2 by Bas Couwenberg at 2019-11-04T13:28:08Z
New upstream release.
- - - - -
9fe5313d by Bas Couwenberg at 2019-11-04T13:48:03Z
Set distribution to experimental.
- - - - -
a61fd7d7 by Martin Landa at 2019-12-13T09:23:04Z
Rebuild 3.0.2 for bionic
- - - - -
6 changed files:
- VERSION
- debian/changelog
- debian/control
- debian/rules
- grass57dataset.cpp
- ogrgrasslayer.cpp
Changes:
=====================================
VERSION
=====================================
@@ -1 +1 @@
-2.4.2
+3.0.2
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libgdal-grass (3.0.2-1~bionic1) bionic; urgency=medium
+
+ * Rebuild for bionic.
+ * Update packaging for GRASS 7.8.2.
+
+ -- Martin Landa <landa.martin at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at debian.org> Sat, 31 Aug 2019 09:09:43 +0200
+
libgdal-grass (2.4.2-1) unstable; urgency=medium
* New upstream release.
=====================================
debian/control
=====================================
@@ -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/
=====================================
debian/rules
=====================================
@@ -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)
=====================================
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 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 "";
=====================================
ogrgrasslayer.cpp
=====================================
@@ -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 );
}
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/compare/6db4689aa91457fcc187c0c6349a89047bba1b8a...a61fd7d749f8bc69edd63de076e4b7672dd4e389
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/compare/6db4689aa91457fcc187c0c6349a89047bba1b8a...a61fd7d749f8bc69edd63de076e4b7672dd4e389
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/20191213/4aeb5f1e/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list