[Git][debian-gis-team/grass][ubuntugis/noble] 6 commits: Revert "Update branch in gbp.conf & Vcs-Git URL."
Martin Landa (@martinl-guest)
gitlab at salsa.debian.org
Sun Mar 2 15:33:38 GMT 2025
Martin Landa pushed to branch ubuntugis/noble at Debian GIS Project / grass
Commits:
bb9fea55 by Bas Couwenberg at 2025-02-24T18:03:43+01:00
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit 0851e7a4d0ec4b8052a021cd03f2406b925d63a3.
- - - - -
13ccf4fd by Bas Couwenberg at 2025-02-24T18:06:10+01:00
New upstream version 8.4.1
- - - - -
7dfc51de by Bas Couwenberg at 2025-02-24T18:09:09+01:00
Update upstream source from tag 'upstream/8.4.1'
Update to upstream version '8.4.1'
with Debian dir d4ad54bcf03af74d8b45b07c9dc3740c2c67a0a4
- - - - -
4d978ab8 by Bas Couwenberg at 2025-02-24T18:09:23+01:00
New upstream release.
- - - - -
c4919eb4 by Bas Couwenberg at 2025-02-24T18:10:45+01:00
Set distribution to unstable.
- - - - -
39120b09 by Martin Landa at 2025-03-02T15:59:56+01:00
Rebuild 8.4.1 for noble
- - - - -
17 changed files:
- .dockerignore
- .github/labeler.yml
- .github/workflows/macos_dependencies.txt
- − .travis.yml
- − .travis/linux.before_install.sh
- − .travis/linux.install.sh
- − .travis/linux.script.sh
- Dockerfile
- README.md
- debian/changelog
- doc/infrastructure.md
- docker/alpine/Dockerfile
- docker/ubuntu/Dockerfile
- include/VERSION
- mswindows/osgeo4w/package.sh
- python/grass/docs/src/gunittest_testing.rst
- raster/r.sim/r.sim.sediment/r.sim.sediment.html
Changes:
=====================================
.dockerignore
=====================================
@@ -3,8 +3,6 @@ docker
!docker/alpine/grass_tests.sh
.gitignore
.github
-.travis
-.travis.yml
# Do not copy files from previous compilations
dist.*
=====================================
.github/labeler.yml
=====================================
@@ -84,9 +84,7 @@ CI:
- changed-files:
- any-glob-to-any-file:
- .github/**
- - .travis/**
- binder/**
- - .travis.yml
- renovate.json
- .pre-commit-config.yaml
Windows:
=====================================
.github/workflows/macos_dependencies.txt
=====================================
@@ -44,6 +44,6 @@ python
python.app
setuptools
six
-sqlite
+sqlite<3.49.0
wxpython
zstd
=====================================
.travis.yml deleted
=====================================
@@ -1,40 +0,0 @@
----
-# Author: Ivan Mincik, ivan.mincik at gmail.com (linux)
-# Rainer M. Krug, Rainer at krugs.de (osx)
-
-language: c
-cache: ccache
-
-matrix:
- include:
- - os: linux
- dist: focal
- compiler: gcc
- sudo: required
- env: CC=gcc CXX=g++
-
- - os: linux
- dist: focal
- compiler: clang
- sudo: required
- env: CC=clang CXX=clang++
-
-env:
- global:
- - CFLAGS="-Werror=implicit-function-declaration"
- - CXXFLAGS="-std=c++11"
-
-before_install:
- - ./.travis/$TRAVIS_OS_NAME.before_install.sh
-
-install:
- - ./.travis/$TRAVIS_OS_NAME.install.sh
-
-script:
- - ./.travis/$TRAVIS_OS_NAME.script.sh
-
-after_success:
- - bash < (curl -s https://codecov.io/bash)
-
-notifications:
- irc: chat.freenode.net#grass
=====================================
.travis/linux.before_install.sh deleted
=====================================
@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-# Author: Ivan Mincik, ivan.mincik at gmail.com
-
-set -e
-
-# build dependencies
-sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable -y
-sudo apt-get update -qq
=====================================
.travis/linux.install.sh deleted
=====================================
@@ -1,53 +0,0 @@
-#!/usr/bin/env sh
-# Author: Ivan Mincik, ivan.mincik at gmail.com
-
-set -e
-
-sudo apt-get install --no-install-recommends \
- libcairo2-dev \
- libfftw3-dev \
- libfreetype6-dev \
- libgdal-dev \
- libgeos-dev \
- libglu1-mesa-dev \
- libgsl-dev \
- libjpeg-dev \
- liblapack-dev \
- libncurses5-dev \
- libnetcdf-dev \
- libopenjp2-7 \
- libopenjp2-7-dev \
- libpdal-dev \
- libpdal-plugin-python \
- libpng-dev \
- libmysqlclient-dev \
- libpq-dev \
- libproj-dev \
- libreadline-dev \
- libsqlite3-dev \
- libtiff-dev \
- libxmu-dev \
- libzstd-dev \
- python3 \
- python3-dateutil \
- python3-dev \
- python3-numpy \
- python3-pil \
- python3-pip \
- python3-ply \
- python-wxgtk3.0 \
- unixodbc-dev \
- libnetcdf-dev \
- autoconf2.13 \
- autotools-dev \
- debhelper \
- ccache \
- fakeroot \
- flex \
- bison \
- netcdf-bin \
- dpatch \
- libblas-dev \
- pdal \
- proj-bin \
- proj-data
=====================================
.travis/linux.script.sh deleted
=====================================
@@ -1,34 +0,0 @@
-#!/usr/bin/env sh
-# Author: Ivan Mincik, ivan.mincik at gmail.com
-
-set -e
-
-export CC="ccache $CC"
-export CXX="ccache $CXX"
-./configure --host=x86_64-linux-gnu \
- --build=x86_64-linux-gnu \
- --prefix=/usr/lib \
- --sysconfdir=/etc \
- --sharedstatedir=/var \
- --enable-shared \
- --with-postgres \
- --with-cxx \
- --with-gdal \
- --with-freetype \
- --with-readline \
- --with-nls \
- --with-odbc \
- --with-geos \
- --with-lapack \
- --with-netcdf \
- --with-blas \
- --with-sqlite \
- --with-zstd \
- --enable-largefile \
- --with-freetype-includes=/usr/include/freetype2/ \
- --with-postgres-includes=/usr/include/postgresql/ \
- --with-proj-share=/usr/share/proj \
- --with-python \
- --with-cairo
-
-make -j2
=====================================
Dockerfile
=====================================
@@ -288,7 +288,7 @@ RUN ./configure $GRASS_CONFIG \
mv module_items.xml /usr/local/grass84/gui/wxpython/xml/module_items.xml;
# Build the GDAL-GRASS plugin
-RUN git clone https://github.com/OSGeo/gdal-grass \
+RUN git clone --depth 1 -b 1.0.3 https://github.com/OSGeo/gdal-grass \
&& cd "gdal-grass" \
&& ./configure \
--with-gdal=/usr/bin/gdal-config \
=====================================
README.md
=====================================
@@ -1,6 +1,5 @@
# GRASS GIS Repository
-[](https://travis-ci.com/OSGeo/grass)
[](https://github.com/OSGeo/grass/actions?query=workflow%3A%22GCC+C%2FC%2B%2B+standards+check%22)
[](https://github.com/OSGeo/grass/actions?query=workflow%3A%22Python+code+quality+check%22)
[](https://github.com/OSGeo/grass/actions?query=workflow%3A%22General+linting%22)
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+grass (8.4.1-1~noble1) noble; urgency=medium
+
+ * Rebuild for noble.
+
+ -- Martin Landa <landa.martin at gmail.com> Sun, 02 Mar 2025 15:58:25 +0100
+
+grass (8.4.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 24 Feb 2025 18:10:20 +0100
+
grass (8.4.1~rc1-1~exp1~noble1) noble; urgency=medium
* Rebuild for noble.
=====================================
doc/infrastructure.md
=====================================
@@ -228,8 +228,7 @@ Maintainer: Vaclav Petras
- Details: <https://github.com/OSGeo/grass/pull/525>
- CI workflow with:
- A build job which is not parallelized and is meant for clear & relatively fast
- check of compilation and building in general. (Duplicating what is running
- on Travis)
+ check of compilation and building in general.
- A test job which of course needs to build, but the main focus is to run tests,
so the compilation is parallelized (depending on nproc) and thus potentially
less readable. This runs the whole test suite. (You need to run it locally to
=====================================
docker/alpine/Dockerfile
=====================================
@@ -178,8 +178,9 @@ RUN cp /usr/local/grass/gui/wxpython/xml/module_items.xml module_items.xml; \
mkdir -p /usr/local/grass/gui/wxpython/xml/; \
mv module_items.xml /usr/local/grass/gui/wxpython/xml/module_items.xml;
-RUN git clone https://github.com/OSGeo/gdal-grass /src/gdal-grass
+RUN git clone --depth 1 -b 1.0.3 https://github.com/OSGeo/gdal-grass /src/gdal-grass
WORKDIR /src/gdal-grass
+
RUN ./configure \
--with-gdal=/usr/bin/gdal-config \
--with-grass=/usr/local/grass && \
=====================================
docker/ubuntu/Dockerfile
=====================================
@@ -288,7 +288,7 @@ RUN ./configure $GRASS_CONFIG \
mv module_items.xml /usr/local/grass84/gui/wxpython/xml/module_items.xml;
# Build the GDAL-GRASS plugin
-RUN git clone https://github.com/OSGeo/gdal-grass \
+RUN git clone --depth 1 -b 1.0.3 https://github.com/OSGeo/gdal-grass \
&& cd "gdal-grass" \
&& ./configure \
--with-gdal=/usr/bin/gdal-config \
=====================================
include/VERSION
=====================================
@@ -1,4 +1,4 @@
8
4
-1RC1
+1
2025
=====================================
mswindows/osgeo4w/package.sh
=====================================
@@ -174,7 +174,7 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
--with-proj-libs=$OSGEO4W_ROOT_MSYS/lib \
--with-postgres \
--with-postgres-includes=$OSGEO4W_ROOT_MSYS/include \
- --with-postgres-libs=${SRC}/mswindows/osgeo4w/lib \
+ --with-postgres-libs=${PWD}/mswindows/osgeo4w/lib \
--with-gdal=$PWD/mswindows/osgeo4w/gdal-config \
--with-geos=$PWD/mswindows/osgeo4w/geos-config \
--with-sqlite \
=====================================
python/grass/docs/src/gunittest_testing.rst
=====================================
@@ -672,8 +672,8 @@ For C/C++ code we additionally use the third party solution `Coverity Scan`_
where GRASS GIS is registered as project number `1038`_. Also you can use
`Cppcheck`_ which will show a lot of errors which compilers do not check.
In any case, set your compiler to high error and warning levels,
-check them and fix them in your code. Furthermore, `Travis-CI`_ is used
-to check if the source code can still be compiled after submitting changes
+check them and fix them in your code. Furthermore, continuous integrations is
+used to check if the source code can still be compiled after submitting changes
to the repository.
For Python, we recommend pylint and then for style issues pep8 tool
@@ -718,7 +718,6 @@ Further reading
.. _unittest: https://docs.python.org/2/library/unittest.html
.. _doctest: https://docs.python.org/2/library/doctest.html
.. _Coverity Scan: https://scan.coverity.com/
-.. _Travis-CI: https://travis-ci.org/github/OSGeo/grass
.. _1038: https://scan.coverity.com/projects/1038
.. _Cppcheck: http://cppcheck.sourceforge.net/
.. _sandbox: https://svn.osgeo.org/grass/sandbox/wenzeslaus/grass_py_static_check.py
=====================================
raster/r.sim/r.sim.sediment/r.sim.sediment.html
=====================================
@@ -27,7 +27,7 @@ reference literature (see suggested values in Notes and References). <br>
<p>
Output includes transport capacity raster map <i>transport_capacity</i> in [kg/ms],
transport capacity limited erosion/deposition raster map
-<i>tlimit_erosion_deposition</i> [kg/m<sup>2</sup>s]i that are output almost immediately and
+<i>tlimit_erosion_deposition</i> [kg/m<sup>2</sup>s] that are output almost immediately and
can be viewed while the simulation continues. Sediment flow rate raster map
<i>sediment_flux</i> [kg/ms], and net erosion/deposition raster map [kg/m<sup>2</sup>s]
can take longer time depending on time step and simulation time.
View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/-/compare/9b2a5ff665929881b18026c0ded2425eab85fdba...39120b094cdd8022083cb8849deb470e4a9d7cd3
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/-/compare/9b2a5ff665929881b18026c0ded2425eab85fdba...39120b094cdd8022083cb8849deb470e4a9d7cd3
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/20250302/d20c61f7/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list