[Git][debian-gis-team/gdal-grass][master] 11 commits: Update branch in gbp.conf & Vcs-Git URL.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sun Aug 10 06:58:16 BST 2025
Bas Couwenberg pushed to branch master at Debian GIS Project / gdal-grass
Commits:
f05310be by Bas Couwenberg at 2025-06-11T21:23:50+02:00
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
0addd5ff by Bas Couwenberg at 2025-06-11T21:24:05+02:00
New upstream version 1.0.4~rc1
- - - - -
9cfbc23e by Bas Couwenberg at 2025-06-11T21:24:07+02:00
Update upstream source from tag 'upstream/1.0.4_rc1'
Update to upstream version '1.0.4~rc1'
with Debian dir 9680436894af0ee8c7f9a8749f00a087006f73ef
- - - - -
31b85fd3 by Bas Couwenberg at 2025-06-11T21:24:36+02:00
New upstream release candidate.
- - - - -
774a9b3a by Bas Couwenberg at 2025-06-11T21:25:40+02:00
Set distribution to experimental.
- - - - -
99bed43c by Bas Couwenberg at 2025-06-19T15:09:11+02:00
New upstream version 1.0.4
- - - - -
607bd632 by Bas Couwenberg at 2025-06-19T15:09:12+02:00
Update upstream source from tag 'upstream/1.0.4'
Update to upstream version '1.0.4'
with Debian dir 90e924e976566c9db30b0443e26a87620e0dd19d
- - - - -
61e6ed02 by Bas Couwenberg at 2025-06-19T15:09:41+02:00
New upstream release.
- - - - -
10bd8dd1 by Bas Couwenberg at 2025-06-19T15:10:32+02:00
Set distribution to experimental.
- - - - -
92a58252 by Bas Couwenberg at 2025-08-10T07:54:58+02:00
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit f05310be82d8dbed18eeeeb1ce5d0deb4292b07f.
- - - - -
c88ada96 by Bas Couwenberg at 2025-08-10T07:55:15+02:00
Move from experimental to unstable.
- - - - -
5 changed files:
- CMakeLists.txt
- debian/changelog
- ogrgrass.h
- ogrgrasslayer.cpp
- utils/generate_release_notes.py
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -14,7 +14,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
# Project and version
set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "0")
-set(CPACK_PACKAGE_VERSION_PATCH "3")
+set(CPACK_PACKAGE_VERSION_PATCH "4")
set(COMPLETE_VERSION
${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}
)
=====================================
debian/changelog
=====================================
@@ -1,9 +1,22 @@
-libgdal-grass (1:1.0.3-3) UNRELEASED; urgency=medium
+libgdal-grass (1:1.0.4-1) unstable; urgency=medium
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 10 Aug 2025 07:55:03 +0200
+
+libgdal-grass (1:1.0.4-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 19 Jun 2025 15:10:16 +0200
+
+libgdal-grass (1:1.0.4~rc1-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
* Bump Standards-Version to 4.7.2, no changes.
* Make autopkgtest script more verbose.
- -- Bas Couwenberg <sebastic at debian.org> Thu, 20 Mar 2025 06:05:01 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 11 Jun 2025 21:25:27 +0200
libgdal-grass (1:1.0.3-2) unstable; urgency=medium
=====================================
ogrgrass.h
=====================================
@@ -30,6 +30,7 @@
#ifndef OGRGRASS_H_INCLUDED
#define OGRGRASS_H_INCLUDED
+#include "gdal_version.h"
#include "ogrsf_frmts.h"
extern "C"
@@ -56,12 +57,19 @@ class OGRGRASSLayer final : public OGRLayer
return poFeatureDefn;
}
GIntBig GetFeatureCount(int) override;
+
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
+ OGRErr IGetExtent(int iGeomField, OGREnvelope *psExtent, bool bForce)
+ override;
+#else
OGRErr GetExtent(OGREnvelope *psExtent, int bForce) override;
virtual OGRErr GetExtent(int iGeomField, OGREnvelope *psExtent,
int bForce) override
{
return OGRLayer::GetExtent(iGeomField, psExtent, bForce);
}
+#endif
+
virtual OGRSpatialReference *GetSpatialRef() override;
int TestCapability(const char *) override;
@@ -73,11 +81,16 @@ class OGRGRASSLayer final : public OGRLayer
// Filters
virtual OGRErr SetAttributeFilter(const char *query) override;
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
+ virtual OGRErr ISetSpatialFilter(int iGeomField,
+ const OGRGeometry *poGeom) override;
+#else
virtual void SetSpatialFilter(OGRGeometry *poGeomIn) override;
virtual void SetSpatialFilter(int iGeomField, OGRGeometry *poGeom) override
{
OGRLayer::SetSpatialFilter(iGeomField, poGeom);
}
+#endif
private:
char *pszName;
=====================================
ogrgrasslayer.cpp
=====================================
@@ -643,11 +643,20 @@ bool OGRGRASSLayer::ResetSequentialCursor()
/************************************************************************/
/* SetSpatialFilter */
/************************************************************************/
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
+OGRErr OGRGRASSLayer::ISetSpatialFilter(int iGeomField,
+ const OGRGeometry *poGeomIn)
+#else
void OGRGRASSLayer::SetSpatialFilter(OGRGeometry *poGeomIn)
+#endif
{
CPLDebug("GRASS", "SetSpatialFilter");
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
+ OGRLayer::ISetSpatialFilter(iGeomField, poGeomIn);
+#else
OGRLayer::SetSpatialFilter(poGeomIn);
+#endif
if (poGeomIn == NULL)
{
@@ -657,10 +666,14 @@ void OGRGRASSLayer::SetSpatialFilter(OGRGeometry *poGeomIn)
CPLFree(paSpatialMatch);
paSpatialMatch = NULL;
}
- return;
}
-
- SetSpatialMatch();
+ else
+ {
+ SetSpatialMatch();
+ }
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
+ return OGRERR_NONE;
+#endif
}
/************************************************************************/
@@ -1071,7 +1084,12 @@ GIntBig OGRGRASSLayer::GetFeatureCount(int bForce)
/* */
/* Returns OGRERR_NONE/OGRRERR_FAILURE. */
/************************************************************************/
+#if GDAL_VERSION_NUM >= GDAL_COMPUTE_VERSION(3, 11, 0)
+OGRErr OGRGRASSLayer::IGetExtent(int /*iGeomField */, OGREnvelope *psExtent,
+ bool /*bForce*/)
+#else
OGRErr OGRGRASSLayer::GetExtent(OGREnvelope *psExtent, int /*bForce*/)
+#endif
{
struct bound_box box;
=====================================
utils/generate_release_notes.py
=====================================
@@ -65,7 +65,7 @@ def split_to_categories(changes, categories):
def print_section_heading_2(text, file=None):
- print(f"### {text}\n", file=file)
+ print(f"## {text}\n", file=file)
def print_section_heading_3(text, file=None):
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/compare/b5447583537853b9df962cca18cb4b7c4507db45...c88ada96360a4e0b5d2008da3d65bab6e52a9e8c
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/compare/b5447583537853b9df962cca18cb4b7c4507db45...c88ada96360a4e0b5d2008da3d65bab6e52a9e8c
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/20250810/2142c561/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list