[Git][debian-gis-team/gdal-grass][experimental] 15 commits: Revert "Update branch in gbp.conf & Vcs-Git URL."
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Wed Jun 11 20:41:00 BST 2025
Bas Couwenberg pushed to branch experimental at Debian GIS Project / gdal-grass
Commits:
48cfd997 by Bas Couwenberg at 2025-02-06T15:59:20+01:00
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit 5e75637a6d53923c67bb5b67da7275c9cfc63cb5.
- - - - -
d7d8e616 by Bas Couwenberg at 2025-02-06T15:59:36+01:00
New upstream version 1.0.3
- - - - -
ce19d82c by Bas Couwenberg at 2025-02-06T15:59:38+01:00
Update upstream source from tag 'upstream/1.0.3'
Update to upstream version '1.0.3'
with Debian dir d46428e07baf34a50ce369c5f6b5c7347b482329
- - - - -
49c4e001 by Bas Couwenberg at 2025-02-06T15:59:56+01:00
New upstream release.
- - - - -
a56263a1 by Bas Couwenberg at 2025-02-06T16:00:45+01:00
Set distribution to unstable.
- - - - -
aa9f17e1 by Bas Couwenberg at 2025-02-24T18:27:09+01:00
Update packaging for GRASS 8.4.1.
- - - - -
bbd19283 by Bas Couwenberg at 2025-02-24T18:27:23+01:00
Set distribution to unstable.
- - - - -
12dd81f8 by Bas Couwenberg at 2025-03-20T06:05:01+01:00
Bump Standards-Version to 4.7.2, no changes.
- - - - -
98efb50e by Bas Couwenberg at 2025-04-17T20:54:31+02:00
Make autopkgtest script more verbose.
- - - - -
b5447583 by Bas Couwenberg at 2025-04-17T21:23:46+02:00
Don't make wget & tar commands verbose.
- - - - -
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.
- - - - -
9 changed files:
- .github/how_to_release.md
- .github/workflows/publish.yml
- debian/changelog
- debian/control
- debian/tests/gdalinfo-ogrinfo
- ogrgrass.h
- ogrgrasslayer.cpp
- utils/generate_release_notes.py
- utils/release.yml
Changes:
=====================================
.github/how_to_release.md
=====================================
@@ -16,7 +16,7 @@ version="x.y.z"
commit=$(git rev-parse HEAD)
tag_message="gdal-grass ${version}"
git tag -a -m "${tag_message}" $version $commit
-git push -u --tags upstream
+git push --tags upstream
```
2. Create a new release on GH, based on the above created tag. "Publish release"
=====================================
.github/workflows/publish.yml
=====================================
@@ -43,7 +43,13 @@ jobs:
run: |
lasttag=""
for tag in $(git tag -n --sort=-creatordate | cut -d' ' -f 1); do
- if [[ $tag != *"RC"* && $tag != ${{ github.ref_name }} ]]; then
+ if [[ ${{ github.ref_name }} != *"rc"* && $tag != *"rc"* && \
+ $tag != ${{ github.ref_name }} ]]
+ then
+ lasttag="$tag"
+ break
+ elif [[ $tag != ${{ github.ref_name }} && ${{ github.ref_name }} == *"rc"* ]]
+ then
lasttag="$tag"
break
fi
=====================================
debian/changelog
=====================================
@@ -1,3 +1,24 @@
+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> Wed, 11 Jun 2025 21:25:27 +0200
+
+libgdal-grass (1:1.0.3-2) unstable; urgency=medium
+
+ * Update packaging for GRASS 8.4.1.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 24 Feb 2025 18:27:10 +0100
+
+libgdal-grass (1:1.0.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 06 Feb 2025 16:00:29 +0100
+
libgdal-grass (1:1.0.3~rc2-1~exp1) experimental; urgency=medium
* New upstream release candidate.
=====================================
debian/control
=====================================
@@ -6,10 +6,10 @@ Section: science
Priority: optional
Build-Depends: cmake,
debhelper-compat (= 13),
- grass-dev (>= 8.4.0),
+ grass-dev (>= 8.4.1),
libgdal-dev (>= 3.5.0),
libpq-dev
-Standards-Version: 4.7.0
+Standards-Version: 4.7.2
Vcs-Browser: https://salsa.debian.org/debian-gis-team/gdal-grass
Vcs-Git: https://salsa.debian.org/debian-gis-team/gdal-grass.git -b experimental
Homepage: https://github.com/OSGeo/gdal-grass
=====================================
debian/tests/gdalinfo-ogrinfo
=====================================
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
DATASET_URL="https://grass.osgeo.org/sampledata/spearfish_grass70data-0.3.tar.gz"
DATASET_FILE="spearfish.tar.gz"
@@ -7,7 +7,10 @@ TEMPDIR="$(mktemp -d)"
cd "${TEMPDIR}" || exit 1
-wget -q "${DATASET_URL}" -O "${DATASET_FILE}"
+CMD=("wget" "-q" "${DATASET_URL}" "-O" "${DATASET_FILE}")
+
+echo "Downloading dataset: ${CMD[@]}"
+${CMD[@]}
RC=$?
if [ "${RC}" -ne 0 ]; then
@@ -17,7 +20,12 @@ if [ "${RC}" -ne 0 ]; then
exit "${RC}"
fi
-tar xaf "${DATASET_FILE}"
+echo
+
+CMD=(tar xaf "${DATASET_FILE}")
+
+echo "Unpacking dataset: ${CMD[@]}"
+${CMD[@]}
RC=$?
if [ "${RC}" -ne 0 ]; then
@@ -27,9 +35,14 @@ if [ "${RC}" -ne 0 ]; then
exit "${RC}"
fi
+echo
+
+CMD=("gdalinfo" ./spearfish*/PERMANENT/cellhd/geology)
+
+echo "Executing: GISBASE="$(ls -d /usr/lib/grass??)" PROJ_NETWORK=ON ${CMD[@]}"
GISBASE="$(ls -d /usr/lib/grass??)" \
PROJ_NETWORK=ON \
-gdalinfo ./spearfish*/PERMANENT/cellhd/geology
+${CMD[@]}
RC=$?
if [ "${RC}" -ne 0 ]; then
@@ -41,9 +54,12 @@ fi
echo
+CMD=("ogrinfo" "-so" "-al" ./spearfish*/PERMANENT/vector/roads/head)
+
+echo "Executing: GISBASE="$(ls -d /usr/lib/grass??)" PROJ_NETWORK=ON ${CMD[@]}"
GISBASE="$(ls -d /usr/lib/grass??)" \
PROJ_NETWORK=ON \
-ogrinfo -so -al ./spearfish*/PERMANENT/vector/roads/head
+${CMD[@]}
RC=$?
cd "${OLDPWD}" || exit 1
=====================================
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):
=====================================
utils/release.yml
=====================================
@@ -11,7 +11,7 @@ notes:
regexp: '(winGRASS|win|[Ww]indows): '
- title: Packaging, Configuration, Portability, and Compilation
- regexp: '(packaging|pkg|rpm|deb|pkg-config|configure|config|[Mm]ake|build): '
+ regexp: '(packaging|pkg|rpm|deb|pkg-config|configure|config|[Mm]ake|build|cmake): '
- title: Continuous Integration, Tests, Code Quality, and Checks
regexp: '(CI|ci|CI\(deps\)|ci\(deps\)|[Tt]ests|[Cc]hecks|pytest): '
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/compare/4ddb0de20057b03a75f79622ff2571ba81c84dc2...774a9b3a8ae44b03249a3c476ee5a2482a82408d
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal-grass/-/compare/4ddb0de20057b03a75f79622ff2571ba81c84dc2...774a9b3a8ae44b03249a3c476ee5a2482a82408d
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/20250611/dfea0965/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list