[Git][debian-gis-team/osmium-tool][trixie-backports] 11 commits: Enable build profile CI job.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sun Apr 12 21:22:55 BST 2026
Bas Couwenberg pushed to branch trixie-backports at Debian GIS Project / osmium-tool
Commits:
705bdf60 by Bas Couwenberg at 2026-03-26T15:38:18+01:00
Enable build profile CI job.
- - - - -
bb2cd88d by Bas Couwenberg at 2026-03-26T16:27:49+01:00
Disable i386 CI job, build dependencies not available.
- - - - -
9b8e9c42 by Bas Couwenberg at 2026-04-04T10:16:19+02:00
Bump Standards-Version to 4.7.4, changes: priority.
- - - - -
dbfb7cbf by Bas Couwenberg at 2026-04-04T10:55:42+02:00
Fix changelog entry.
- - - - -
52d12492 by Bas Couwenberg at 2026-04-07T11:51:03+02:00
New upstream version 1.19.1
- - - - -
9ee23556 by Bas Couwenberg at 2026-04-07T11:51:05+02:00
Update upstream source from tag 'upstream/1.19.1'
Update to upstream version '1.19.1'
with Debian dir c0daa744511a1afbda7affb31c6ef4610bdb5fab
- - - - -
43f9c863 by Bas Couwenberg at 2026-04-07T11:51:16+02:00
New upstream release.
- - - - -
bbd4c4af by Bas Couwenberg at 2026-04-07T11:52:41+02:00
Bump minimum required libosmium2-dev to 2.23.1.
- - - - -
2d6bd89b by Bas Couwenberg at 2026-04-07T11:52:57+02:00
Set distribution to unstable.
- - - - -
33c47f68 by Bas Couwenberg at 2026-04-12T06:46:44+02:00
Merge tag 'debian/1.19.1-1' into trixie-backports
releasing package osmium-tool version 1.19.1-1
- - - - -
f65e318d by Bas Couwenberg at 2026-04-12T06:47:00+02:00
Rebuild for trixie-backports.
- - - - -
13 changed files:
- CHANGELOG.md
- CMakeLists.txt
- README.md
- debian/.gitlab-ci.yml
- debian/changelog
- debian/control
- man/osmium-apply-changes.md
- man/osmium-merge-changes.md
- src/command_apply_changes.cpp
- src/command_merge_changes.cpp
- test/apply-changes/input-version+timestamp.osm
- test/apply-changes/input-version.osc
- test/apply-changes/output-version-applied-on-version+timestamp.osm
Changes:
=====================================
CHANGELOG.md
=====================================
@@ -13,6 +13,16 @@ This project adheres to [Semantic Versioning](https://semver.org/).
### Fixed
+## [1.19.1] - 2026-04-07
+
+### Changed
+
+* Various documentation changes.
+
+### Fixed
+
+* Use libosmium 2.23.1 which reverted a change that broke updating of extracts.
+
## [1.19.0] - 2026-01-18
### Added
@@ -775,7 +785,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
- Minor updates to documentation and build system
-[unreleased]: https://github.com/osmcode/osmium-tool/compare/v1.19.0...HEAD
+[unreleased]: https://github.com/osmcode/osmium-tool/compare/v1.19.1...HEAD
+[1.19.1]: https://github.com/osmcode/osmium-tool/compare/v1.19.0...v1.19.1
[1.19.0]: https://github.com/osmcode/osmium-tool/compare/v1.18.0...v1.19.0
[1.18.0]: https://github.com/osmcode/osmium-tool/compare/v1.17.0...v1.18.0
[1.17.0]: https://github.com/osmcode/osmium-tool/compare/v1.16.0...v1.17.0
=====================================
CMakeLists.txt
=====================================
@@ -8,7 +8,7 @@
cmake_minimum_required(VERSION 3.10)
-project(osmium VERSION 1.19.0 LANGUAGES CXX C)
+project(osmium VERSION 1.19.1 LANGUAGES CXX C)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
@@ -64,7 +64,7 @@ option(RUN_TESTS_WITH_BINARY_COMPARE "Run tests that do binary comparisons" ON)
find_package(Boost CONFIG 1.55.0 REQUIRED COMPONENTS program_options)
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-find_package(Osmium 2.20.0 REQUIRED COMPONENTS io)
+find_package(Osmium 2.23.1 REQUIRED COMPONENTS io)
include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS})
find_package(nlohmann_json)
=====================================
README.md
=====================================
@@ -15,7 +15,7 @@ You need a C++17 compliant compiler.
You also need the following libraries:
- Libosmium (>= 2.16.0)
+ Libosmium (>= 2.23.1)
https://osmcode.org/libosmium
Debian/Ubuntu: libosmium2-dev
Fedora/CentOS: libosmium-devel
=====================================
debian/.gitlab-ci.yml
=====================================
@@ -4,4 +4,14 @@ include:
variables:
RELEASE: 'trixie-backports'
+ SALSA_CI_DISABLE_BUILD_PACKAGE_I386: 1
+ SALSA_CI_ENABLE_BUILD_PACKAGE_PROFILES: 1
SALSA_CI_ENABLE_VALIDATE_PACKAGE_CLEAN_UP: 1
+
+test-build-profiles:
+ extends: .test-build-package-profiles
+ parallel:
+ matrix:
+ - BUILD_PROFILES:
+ - nocheck
+ - nodoc
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+osmium-tool (1.19.1-1~bpo13+1) trixie-backports; urgency=medium
+
+ * Rebuild for trixie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 12 Apr 2026 06:46:55 +0200
+
+osmium-tool (1.19.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Bump Standards-Version to 4.7.4, no changes.
+ * Bump minimum required libosmium2-dev to 2.23.1.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 07 Apr 2026 11:52:46 +0200
+
osmium-tool (1.19.0-1~bpo13+1) trixie-backports; urgency=medium
* Rebuild for trixie-backports.
=====================================
debian/control
=====================================
@@ -10,11 +10,11 @@ Build-Depends: architecture-is-little-endian,
libboost-program-options-dev,
libbz2-dev,
libexpat1-dev,
- libosmium2-dev (>= 2.22.0),
+ libosmium2-dev (>= 2.23.1),
nlohmann-json3-dev,
pandoc <!nodoc>,
zlib1g-dev
-Standards-Version: 4.7.3
+Standards-Version: 4.7.4
Vcs-Browser: https://salsa.debian.org/debian-gis-team/osmium-tool/
Vcs-Git: https://salsa.debian.org/debian-gis-team/osmium-tool.git -b trixie-backports
Homepage: https://osmcode.org/osmium-tool/
=====================================
man/osmium-apply-changes.md
=====================================
@@ -93,7 +93,7 @@ STDOUT.
**osmium apply-changes** keeps the contents of all the change files in main
memory. This will take roughly 10 times as much memory as the files take on
-disk in *.osm.bz2* format.
+disk in *.osc.bz2* format.
# EXAMPLES
=====================================
man/osmium-merge-changes.md
=====================================
@@ -21,6 +21,13 @@ must specify the change files on the command line in the correct order from
oldest to newest. This is because change files from extracts can contain
multiple different object versions with the same version and timestamp!)
+This command can only be used to merge change files from different points in
+time for the planet or for the same extract. It can not be used to merge
+changes from different, possibly overlapping extracts into one larger change
+for the whole area of all extracts, because it will not produce the correct
+result in all cases. This is not a limit of this command, but is due to the
+limited information available in change files.
+
This commands reads its input file(s) only once and writes its output file
in one go so it can be streamed, ie. it can read from STDIN and write to
STDOUT.
@@ -56,7 +63,7 @@ STDOUT.
**osmium merge-changes** keeps the contents of all the change files in main
memory. This will take roughly 10 times as much memory as the files take on
-disk in *.osm.bz2* format.
+disk in *.osc.bz2* format.
# EXAMPLES
=====================================
src/command_apply_changes.cpp
=====================================
@@ -343,11 +343,12 @@ bool CommandApplyChanges::run() {
m_vout << "Sorting change data...\n";
// This is needed for a special case: When change files have been
- // created from extracts it is possible that they contain objects
- // with the same type, id, version, and timestamp. In that case we
- // still want to get the last object available. So we have to make
- // sure it appears first in the objects vector before doing the
- // stable sort.
+ // created from extracts it is possible that they contain objects with
+ // the same type, id, version, and timestamp. In that case we still
+ // want to get the last object available, because changes should be
+ // applied in the order of the change files on the command line. So we
+ // have to make sure it appears first in the objects vector before
+ // doing the stable sort.
std::reverse(objects.ptr_begin(), objects.ptr_end());
objects.sort(osmium::object_order_type_id_reverse_version{});
=====================================
src/command_merge_changes.cpp
=====================================
@@ -129,11 +129,12 @@ bool CommandMergeChanges::run() {
m_vout << "Sorting change data...\n";
// This is needed for a special case: When change files have been
- // created from extracts it is possible that they contain objects
- // with the same type, id, version, and timestamp. In that case we
- // still want to get the last object available. So we have to make
- // sure it appears first in the objects vector before doing the
- // stable sort.
+ // created from extracts it is possible that they contain objects with
+ // the same type, id, version, and timestamp. In that case we still
+ // want to get the last object available, because changes should be
+ // applied in the order of the change files on the command line. So we
+ // have to make sure it appears first in the objects vector before
+ // doing the stable sort.
std::reverse(objects.ptr_begin(), objects.ptr_end());
objects.sort(osmium::object_order_type_id_reverse_version());
=====================================
test/apply-changes/input-version+timestamp.osm
=====================================
@@ -6,7 +6,6 @@
</node>
<node id="2" version="2" timestamp="2017-01-03T00:00:00Z" lat="50" lon="10.01"/>
<node id="3" version="1" timestamp="2017-01-03T00:00:00Z" lat="50" lon="10.02"/>
- <node id="5" version="1" timestamp="2017-01-03T00:00:00Z" lat="50" lon="10.03"/>
<way id="1" version="1" timestamp="2017-01-03T00:00:00Z">
<nd ref="1"/>
<nd ref="2"/>
=====================================
test/apply-changes/input-version.osc
=====================================
@@ -9,9 +9,6 @@
<delete>
<node id="3" version="1" visible="false"/>
</delete>
- <delete>
- <node id="5" version="2" visible="false"/>
- </delete>
<create>
<node id="4" version="1" lat="50.0" lon="10.02"/>
</create>
=====================================
test/apply-changes/output-version-applied-on-version+timestamp.osm
=====================================
@@ -5,7 +5,6 @@
<tag k="name" v="School"/>
</node>
<node id="2" version="2" timestamp="2017-01-03T00:00:00Z" lat="50" lon="10.01"/>
- <node id="3" version="1" timestamp="2017-01-03T00:00:00Z" lat="50" lon="10.02"/>
<node id="4" version="1" lat="50" lon="10.02"/>
<way id="1" version="2">
<nd ref="1"/>
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmium-tool/-/compare/90822a9631149e6b96186b214dd5ff3d960b22f2...f65e318dc66916b22ebd1b59b3e6d3e34ade2c37
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmium-tool/-/compare/90822a9631149e6b96186b214dd5ff3d960b22f2...f65e318dc66916b22ebd1b59b3e6d3e34ade2c37
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/20260412/ee7d7114/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list