[Git][debian-gis-team/gdal-grass][master] 47 commits: New upstream version 2.5.0~beta1
Bas Couwenberg
gitlab at salsa.debian.org
Wed Jan 8 17:58:46 GMT 2020
Bas Couwenberg pushed to branch master at Debian GIS Project / gdal-grass
Commits:
ad76b7aa by Bas Couwenberg at 2019-04-20T09:25:05+02:00
New upstream version 2.5.0~beta1
- - - - -
bd8bc453 by Bas Couwenberg at 2019-04-20T09:25:06+02:00
Merge tag 'upstream/2.5.0_beta1' into experimental
Upstream version 2.5.0~beta1
- - - - -
7d2360fc by Bas Couwenberg at 2019-04-20T09:25:23+02:00
New upstream beta release.
- - - - -
796b4223 by Bas Couwenberg at 2019-04-20T09:31:30+02:00
Require at least libgdal-dev 2.5.0~.
- - - - -
1e277286 by Bas Couwenberg at 2019-04-26T18:01:15+02:00
New upstream version 2.5.0~rc1
- - - - -
a5d01b66 by Bas Couwenberg at 2019-04-26T18:01:16+02:00
Merge tag 'upstream/2.5.0_rc1' into experimental
Upstream version 2.5.0~rc1
- - - - -
5597f963 by Bas Couwenberg at 2019-04-26T18:01:38+02:00
New upstream release candidate.
- - - - -
877d8f81 by Bas Couwenberg at 2019-05-02T09:55:35+02:00
Update watch file to check version directories.
- - - - -
e5580420 by Bas Couwenberg at 2019-05-02T19:33:08+02:00
New upstream version 3.0.0~rc1
- - - - -
357de006 by Bas Couwenberg at 2019-05-02T19:33:09+02:00
Merge tag 'upstream/3.0.0_rc1' into experimental
Upstream version 3.0.0~rc1
- - - - -
0ff64207 by Bas Couwenberg at 2019-05-02T19:33:53+02:00
New upstream release candidate.
- - - - -
f9052f19 by Bas Couwenberg at 2019-05-05T12:50:03+02:00
New upstream version 3.0.0~rc2
- - - - -
7ffadeef by Bas Couwenberg at 2019-05-05T12:50:04+02:00
Merge tag 'upstream/3.0.0_rc2' into experimental
Upstream version 3.0.0~rc2
- - - - -
8a387b57 by Bas Couwenberg at 2019-05-05T12:50:29+02:00
New upstream release candidate.
- - - - -
0e4e5fa9 by Bas Couwenberg at 2019-05-09T13:32:13+02:00
New upstream version 3.0.0
- - - - -
d57e2ff2 by Bas Couwenberg at 2019-05-09T13:32:16+02:00
Merge tag 'upstream/3.0.0' into experimental
Upstream version 3.0.0
- - - - -
254d2fcf by Bas Couwenberg at 2019-05-09T13:32:41+02:00
New upstream release.
- - - - -
a2570f41 by Bas Couwenberg at 2019-06-28T14:51:26+02:00
New upstream version 3.0.1~rc1
- - - - -
48eeb69d by Bas Couwenberg at 2019-06-28T14:51:27+02:00
Merge tag 'upstream/3.0.1_rc1' into experimental
Upstream version 3.0.1~rc1
- - - - -
e358039f by Bas Couwenberg at 2019-06-28T14:52:02+02:00
New upstream release candidate.
- - - - -
7a5881b8 by Bas Couwenberg at 2019-07-05T13:10:00+02:00
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-05T13:10:00+02:00
New upstream version 3.0.1
- - - - -
8ec488d3 by Bas Couwenberg at 2019-07-05T13:10:38+02:00
New upstream release.
- - - - -
cda8d35b by Bas Couwenberg at 2019-07-07T08:03:51+02:00
Update gbp.conf to use --source-only-changes by default.
- - - - -
b28fce9c by Bas Couwenberg at 2019-07-10T17:58:51+02:00
Bump Standards-Version to 4.4.0, no changes.
- - - - -
62079b61 by Bas Couwenberg at 2019-07-16T13:48:38+02:00
Update PIE hardening conditional, trusty is EOL.
- - - - -
c80e71b8 by Bas Couwenberg at 2019-08-31T09:09:59+02:00
Set distribution to experimental.
- - - - -
2a4b1724 by Bas Couwenberg at 2019-09-07T09:33:52+02:00
Update packaging for GRASS 7.8.0.
- - - - -
8d42e1a0 by Bas Couwenberg at 2019-09-07T10:26:26+02:00
Set distribution to experimental.
- - - - -
551e548c by Bas Couwenberg at 2019-09-08T22:23:00+02:00
Disable as-needed linking on Debian too, gcc-9 enables it by default.
- - - - -
50ec7fba by Bas Couwenberg at 2019-09-08T22:27:39+02:00
Set distribution to experimental.
- - - - -
a2c41a58 by Bas Couwenberg at 2019-09-30T18:58:05+02:00
Bump Standards-Version to 4.4.1, no changes.
- - - - -
589c8b65 by Bas Couwenberg at 2019-10-28T14:42:43+01:00
New upstream version 3.0.2~rc1
- - - - -
ea2c9417 by Bas Couwenberg at 2019-10-28T14:42:44+01:00
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-28T14:43:32+01:00
New upstream release candidate.
- - - - -
7344b533 by Bas Couwenberg at 2019-10-28T15:49:16+01:00
Set distribution to experimental.
- - - - -
04ad7698 by Bas Couwenberg at 2019-11-04T14:27:49+01:00
New upstream version 3.0.2
- - - - -
2509b1d0 by Bas Couwenberg at 2019-11-04T14:27:50+01:00
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-04T14:28:08+01:00
New upstream release.
- - - - -
9fe5313d by Bas Couwenberg at 2019-11-04T14:48:03+01:00
Set distribution to experimental.
- - - - -
da020c57 by Bas Couwenberg at 2019-11-09T12:16:31+01:00
Update packaging for GRASS 7.8.1.
- - - - -
73a4c79c by Bas Couwenberg at 2019-11-09T13:45:10+01:00
Set distribution to experimental.
- - - - -
7d98c0cd by Bas Couwenberg at 2019-12-24T20:35:41+01:00
Update packaging for GRASS 7.8.2.
- - - - -
97fc4440 by Bas Couwenberg at 2019-12-24T20:40:12+01:00
Set distribution to experimental.
- - - - -
a5681a9a by Bas Couwenberg at 2020-01-08T05:53:42+01:00
Merge branch 'experimental'
- - - - -
fbc293ae by Bas Couwenberg at 2020-01-08T05:54:03+01:00
Revert "Update upstream branch in gbp.conf."
This reverts commit e487aaddcf6a7ff34cee288d46815687175458c3.
- - - - -
018d8729 by Bas Couwenberg at 2020-01-08T05:55:49+01:00
Move from experimental to unstable.
- - - - -
6 changed files:
- VERSION
- debian/changelog
- debian/control
- debian/gbp.conf
- grass57dataset.cpp
- ogrgrasslayer.cpp
Changes:
=====================================
VERSION
=====================================
@@ -1 +1 @@
-2.4.3
+3.0.2
=====================================
debian/changelog
=====================================
@@ -1,3 +1,56 @@
+libgdal-grass (3.0.2-1) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> 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 <sebastic at debian.org> Tue, 24 Dec 2019 20:39:58 +0100
+
+libgdal-grass (3.0.2-1~exp2) experimental; urgency=medium
+
+ * Update packaging for GRASS 7.8.1.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 09 Nov 2019 13:44:57 +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 (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 (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.3-3) unstable; urgency=medium
* Update packaging for GRASS 7.8.2.
=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
d-shlibs,
grass (>= 7.8.2),
grass-dev (>= 7.8.2),
- libgdal-dev (>= 2.4.3),
+ libgdal-dev (>= 3.0.2),
libpq-dev,
lsb-release,
pkg-config
=====================================
debian/gbp.conf
=====================================
@@ -2,7 +2,7 @@
# The default name for the upstream branch is "upstream".
# Change it if the name is different (for instance, "master").
-upstream-branch = upstream-2.4
+upstream-branch = upstream
# The default name for the Debian branch is "master".
# Change it if the name is different (for instance, "debian/unstable").
=====================================
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/f2fd471d882e57330e5c978a32a48a0eeeb90b11...018d8729ee149ac71a87bff1944cba5d41e2fcf1
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/compare/f2fd471d882e57330e5c978a32a48a0eeeb90b11...018d8729ee149ac71a87bff1944cba5d41e2fcf1
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/20200108/fa1860c9/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list