[Git][debian-gis-team/osrm-backend][master] 12 commits: Fix Salsa CI config to match to convention.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sat May 2 05:28:01 BST 2026
Bas Couwenberg pushed to branch master at Debian GIS Project / osrm-backend
Commits:
84e7af25 by Bas Couwenberg at 2026-05-02T05:56:26+02:00
Fix Salsa CI config to match to convention.
- - - - -
9914780d by Bas Couwenberg at 2026-05-02T06:05:49+02:00
Use wrap-and-sort to match team convention.
- - - - -
d6e9ca47 by Bas Couwenberg at 2026-05-02T06:05:49+02:00
Update watch file to handle common issues.
- - - - -
9e1952d8 by Bas Couwenberg at 2026-05-02T06:08:18+02:00
Refresh patches using .quiltrc to match team convention.
- - - - -
6d20bd3c by Bas Couwenberg at 2026-05-02T06:09:12+02:00
Use execute_after instead of override.
- - - - -
0c372cb3 by Bas Couwenberg at 2026-05-02T06:10:11+02:00
Add gbp.conf to use pristine-tar & --source-only-changes by default.
- - - - -
9e6f9c98 by Bas Couwenberg at 2026-05-02T06:12:58+02:00
Also exclude .gitattributes from repacked upstream release.
- - - - -
df980b82 by Bas Couwenberg at 2026-05-02T06:13:10+02:00
New upstream version 26.4.1+dfsg2
- - - - -
ba92218d by Bas Couwenberg at 2026-05-02T06:13:17+02:00
Update upstream source from tag 'upstream/26.4.1+dfsg2'
Update to upstream version '26.4.1+dfsg2'
with Debian dir 285905ac00c8f0a5d1b91bfd5ab593b0b3a72052
- - - - -
ebc4d4e5 by Bas Couwenberg at 2026-05-02T06:13:35+02:00
New repacked upstream release.
- - - - -
05b6554a by Bas Couwenberg at 2026-05-02T06:20:24+02:00
Update lintian overrides.
- - - - -
6e76515b by Bas Couwenberg at 2026-05-02T06:23:44+02:00
Use +ds repacksuffix as non-free files are not being excluded.
- - - - -
16 changed files:
- − .gitattributes
- debian/salsa-ci.yml → debian/.gitlab-ci.yml
- debian/changelog
- debian/control
- debian/copyright
- + debian/gbp.conf
- debian/osrm-backend.install
- debian/patches/10_use-system-libraries.patch
- debian/patches/20_add-flatbuffers-schemas.patch
- debian/patches/30_fix-source-ref-crash.patch
- debian/rules
- + debian/source/lintian-overrides
- debian/tests/control
- debian/watch
- third_party/vtzero/build-appveyor.bat
- third_party/vtzero/build-msys2.bat
Changes:
=====================================
.gitattributes deleted
=====================================
@@ -1,18 +0,0 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-
-# Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
-*.cpp text
-*.hpp text
-
-# Declare files that will always have CRLF line endings on checkout.
-*.bat text eol=crlf
-*.cmd text eol=crlf
-*.ps1 text eol=crlf
-
-# Declare files that will always have LF line endings on checkout.
-*.sh text eol=lf
-
-# https://eslint.org/docs/latest/rules/linebreak-style#using-this-rule-with-version-control-systems
-*.js text eol=lf
=====================================
debian/salsa-ci.yml → debian/.gitlab-ci.yml
=====================================
@@ -1,6 +1,17 @@
---
include:
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
+
variables:
- SALSA_CI_DISABLE_LICENSERECON: 0
SALSA_CI_DISABLE_BUILD_PACKAGE_I386: 1
+ SALSA_CI_ENABLE_BUILD_PACKAGE_PROFILES: 1
+ SALSA_CI_ENABLE_LICENSERECON: 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,18 @@
+osrm-backend (26.4.1+dfsg2-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Fix Salsa CI config to match to convention.
+ * Use wrap-and-sort to match team convention.
+ * Update watch file to handle common issues.
+ * Refresh patches using .quiltrc to match team convention.
+ * Use execute_after instead of override.
+ * Add gbp.conf to use pristine-tar & --source-only-changes by default.
+ * Also exclude .gitattributes from repacked upstream release.
+ * Update lintian overrides.
+ * Use +ds repacksuffix as non-free files are not being excluded.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 02 May 2026 06:13:22 +0200
+
osrm-backend (26.4.1+dfsg1-1) unstable; urgency=medium
* Initial release. (Closes: #701506)
=====================================
debian/control
=====================================
@@ -3,35 +3,33 @@ Standards-Version: 4.7.4
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Anton Gladky <gladk at debian.org>
Section: science
-Build-Depends:
- debhelper-compat (= 13),
- cmake,
- libbz2-dev,
- libboost-date-time-dev,
- libboost-iostreams-dev,
- libboost-program-options-dev,
- libboost-thread-dev,
- libboost-test-dev,
- libexpat1-dev,
- flatbuffers-compiler,
- libflatbuffers-dev,
- libfmt-dev,
- liblua5.4-dev,
- libosmium2-dev,
- libprotozero-dev,
- rapidjson-dev,
- libtbb-dev,
- pkgconf,
- zlib1g-dev,
+Build-Depends: debhelper-compat (= 13),
+ cmake,
+ flatbuffers-compiler,
+ libboost-date-time-dev,
+ libboost-iostreams-dev,
+ libboost-program-options-dev,
+ libboost-test-dev,
+ libboost-thread-dev,
+ libbz2-dev,
+ libexpat1-dev,
+ libflatbuffers-dev,
+ libfmt-dev,
+ liblua5.4-dev,
+ libosmium2-dev,
+ libprotozero-dev,
+ libtbb-dev,
+ pkgconf,
+ rapidjson-dev,
+ zlib1g-dev
Vcs-Browser: https://salsa.debian.org/debian-gis-team/osrm-backend
Vcs-Git: https://salsa.debian.org/debian-gis-team/osrm-backend.git
Homepage: https://project-osrm.org
Package: osrm-backend
Architecture: any
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Description: Open Source Routing Machine - high performance routing engine
OSRM is a modern C++ routing engine for shortest paths in road networks.
It uses OpenStreetMap data as its data source. OSRM supports Linux,
@@ -48,10 +46,9 @@ Description: Open Source Routing Machine - high performance routing engine
Package: osrm-backend-service
Architecture: all
-Depends:
- osrm-backend (>= ${source:Version}),
- adduser,
- ${misc:Depends},
+Depends: osrm-backend (>= ${source:Version}),
+ adduser,
+ ${misc:Depends}
Description: Open Source Routing Machine - systemd service
OSRM is a modern C++ routing engine for shortest paths in road networks.
It uses OpenStreetMap data as its data source.
@@ -67,9 +64,8 @@ Description: Open Source Routing Machine - systemd service
Package: libosrm26
Architecture: any
Section: libs
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Description: Open Source Routing Machine - shared libraries
OSRM is a modern C++ routing engine for shortest paths in road networks.
It uses OpenStreetMap data as its data source.
@@ -80,10 +76,9 @@ Description: Open Source Routing Machine - shared libraries
Package: libosrm-dev
Architecture: any
Section: libdevel
-Depends:
- libosrm26 (= ${binary:Version}),
- libflatbuffers-dev,
- ${misc:Depends},
+Depends: libosrm26 (= ${binary:Version}),
+ libflatbuffers-dev,
+ ${misc:Depends}
Description: Open Source Routing Machine - development files
OSRM is a modern C++ routing engine for shortest paths in road networks.
It uses OpenStreetMap data as its data source.
=====================================
debian/copyright
=====================================
@@ -2,89 +2,64 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: https://github.com/Project-OSRM/osrm-backend
Upstream-Name: osrm-backend
Upstream-Contact: Project OSRM contributors
-Files-Excluded:
- third_party/flatbuffers
- generated
- third_party/rapidjson
- third_party/libosmium
- third_party/fmt
- third_party/protozero
- .github
- .husky
- docker
- scripts
-
-Files:
- *
-Copyright:
- 2017-2026 Project OSRM contributors
+Files-Excluded: .gitattributes
+ .github
+ .husky
+ docker
+ generated
+ scripts
+ third_party/flatbuffers
+ third_party/fmt
+ third_party/libosmium
+ third_party/protozero
+ third_party/rapidjson
+
+Files: *
+Copyright: 2017-2026, Project OSRM contributors
License: BSD-2-clause
-Files:
- package-lock.json
-Copyright:
- 2017-2026 Project OSRM contributors
+Files: package-lock.json
+Copyright: 2017-2026, Project OSRM contributors
License: BSD-2-clause or Expat
-
-Files:
- cmake/FindTBB.cmake
-Copyright:
- 2010-2012 Kitware, Inc.
- 2012 Rolf Eike Beer <eike at sf-mail.de>
+Files: cmake/FindTBB.cmake
+Copyright: 2010-2012, Kitware, Inc.
+ 2012, Rolf Eike Beer <eike at sf-mail.de>
License: public-domain
The contents of this file are placed in the public domain.
-
-Files:
- third_party/microtar/*
-Copyright:
- 2017 rxi
+Files: third_party/microtar/*
+Copyright: 2017, rxi
License: Expat
-Files:
- third_party/sol2/*
-Copyright:
- 2013-2020 Rapptz, ThePhD and contributors
+Files: third_party/sol2/*
+Copyright: 2013-2020, Rapptz, ThePhD and contributors
License: Expat
-Files:
- third_party/vtzero/*
-Copyright:
- 2017 Mapbox
+Files: third_party/vtzero/*
+Copyright: 2017, Mapbox
License: BSD-2-clause
-Files:
- third_party/vtzero/EXTERNAL_LICENSES.txt
-Copyright:
- 2017 Two Blue Cubes Ltd.
+Files: third_party/vtzero/EXTERNAL_LICENSES.txt
+Copyright: 2017, Two Blue Cubes Ltd.
License: BSL-1.0
-Files:
- third_party/vtzero/include-external/clara.hpp
-Copyright:
- 2017 Two Blue Cubes Ltd.
+Files: third_party/vtzero/include-external/clara.hpp
+Copyright: 2017, Two Blue Cubes Ltd.
License: BSD-2-clause or BSL-1.0
-Files:
- third_party/vtzero/test/catch/catch.hpp
-Copyright:
- 2017-2020 Two Blue Cubes Ltd.
+Files: third_party/vtzero/test/catch/catch.hpp
+Copyright: 2017-2020, Two Blue Cubes Ltd.
License: BSL-1.0
-Files:
- debian/*
-Copyright:
- 2026 Anton Gladky <gladk at debian.org>
+Files: debian/*
+Copyright: 2026, Anton Gladky <gladk at debian.org>
License: GPL-2+
-Files:
- debian/tests/monaco-260425.osm.pbf
-Copyright:
- OpenStreetMap contributors
+Files: debian/tests/monaco-260425.osm.pbf
+Copyright: OpenStreetMap contributors
License: ODbL-1.0
-Comment:
- OpenStreetMap data extract for Monaco, downloaded 2026-04-25.
+Comment: OpenStreetMap data extract for Monaco, downloaded 2026-04-25.
Source: https://www.openstreetmap.org
License: BSD-2-clause
=====================================
debian/gbp.conf
=====================================
@@ -0,0 +1,19 @@
+[DEFAULT]
+
+# The default name for the upstream branch is "upstream".
+# Change it if the name is different (for instance, "master").
+upstream-branch = upstream
+
+# The default name for the Debian branch is "master".
+# Change it if the name is different (for instance, "debian/unstable").
+debian-branch = master
+
+# git-import-orig uses the following names for the upstream tags.
+# Change the value if you are not using git-import-orig
+upstream-tag = upstream/%(version)s
+
+# Always use pristine-tar.
+pristine-tar = True
+
+[buildpackage]
+pbuilder-options = --source-only-changes
=====================================
debian/osrm-backend.install
=====================================
@@ -1,9 +1,9 @@
-usr/bin/osrm-routed
-usr/bin/osrm-extract
-usr/bin/osrm-partition
-usr/bin/osrm-customize
+usr/bin/osrm-components
usr/bin/osrm-contract
+usr/bin/osrm-customize
usr/bin/osrm-datastore
-usr/bin/osrm-components
+usr/bin/osrm-extract
usr/bin/osrm-io-benchmark
+usr/bin/osrm-partition
+usr/bin/osrm-routed
usr/share/osrm/
=====================================
debian/patches/10_use-system-libraries.patch
=====================================
@@ -5,10 +5,8 @@ Description: Use system libraries instead of bundled copies
yet available in Debian.
Author: Anton Gladky <gladk at debian.org>
Forwarded: no
-Index: osrm-backend/CMakeLists.txt
-===================================================================
---- osrm-backend.orig/CMakeLists.txt
-+++ osrm-backend/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -212,6 +212,12 @@ add_library(osrm::customize ALIAS osrm_c
add_library(osrm::update ALIAS osrm_update)
add_library(osrm::store ALIAS osrm_store)
=====================================
debian/patches/20_add-flatbuffers-schemas.patch
=====================================
@@ -1,12 +1,10 @@
Description: Regenerate FlatBuffers C++ headers at build time using system flatc
Author: Anton Gladky <gladk at debian.org>
Forwarded: not-needed
-Index: osrm-backend-26.4.1/CMakeLists.txt
-===================================================================
---- osrm-backend-26.4.1.orig/CMakeLists.txt
-+++ osrm-backend-26.4.1/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -152,7 +152,25 @@ include(GNUInstallDirs)
-
+
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/)
-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/generated/include/)
@@ -30,5 +28,5 @@ Index: osrm-backend-26.4.1/CMakeLists.txt
+endif()
+include_directories(SYSTEM "${FBS_GEN_DIR}")
include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/sol2/include)
-
+
set(BOOST_COMPONENTS date_time iostreams program_options thread unit_test_framework)
=====================================
debian/patches/30_fix-source-ref-crash.patch
=====================================
@@ -17,3 +17,4 @@ Forwarded: not-needed
+ : std::string(x))
// Return the path of a file, relative to the OSRM_PROJECT_DIR
#define OSRM_SOURCE_FILE_ PROJECT_RELATIVE_PATH_(__FILE__)
+
=====================================
debian/rules
=====================================
@@ -12,6 +12,5 @@ override_dh_auto_configure:
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInfo
-override_dh_install:
- dh_install
+execute_after_dh_install:
rm -rf debian/libosrm-dev/usr/include/flatbuffers
=====================================
debian/source/lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# Not supported by devscripts in trixie
+older-debian-watch-file-standard 4 *
+
=====================================
debian/tests/control
=====================================
@@ -2,17 +2,21 @@ Tests: smoketest
Depends: osrm-backend
Tests: routing
-Depends: osrm-backend, curl
+Depends: curl,
+ osrm-backend
Tests: routing-mld
-Depends: osrm-backend, curl
+Depends: curl,
+ osrm-backend
Tests: components
Depends: osrm-backend
Tests: profiles
-Depends: osrm-backend, curl
+Depends: curl,
+ osrm-backend
Tests: service
-Depends: osrm-backend-service, curl
+Depends: curl,
+ osrm-backend-service
Restrictions: needs-root
=====================================
debian/watch
=====================================
@@ -1,6 +1,8 @@
version=4
-opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/osrm-backend-$1\.tar\.gz/,\
- repacksuffix=+dfsg1,\
- dversionmangle=s/\+dfsg\d*$// \
- https://github.com/Project-OSRM/osrm-backend/tags \
- .*/v?(\d[\d.]+)\.tar\.gz
+opts=\
+dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
+filenamemangle=s/(?:.*\/)?(?:rel|v|osrm-backend)[\-\_]?(\d[\d\-\.]*)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/osrm-backend-$1.$2/,\
+repacksuffix=+ds \
+https://github.com/Project-OSRM/osrm-backend/tags \
+(?:.*?/archive/(?:.*?/)?)?(?:rel|v|osrm-backend)[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
=====================================
third_party/vtzero/build-appveyor.bat
=====================================
@@ -1,53 +1,53 @@
- at ECHO OFF
-SETLOCAL
-SET EL=0
-
-ECHO ~~~~~~ %~f0 ~~~~~~
-
-::show all available env vars
-SET
-ECHO cmake on AppVeyor
-cmake -version
-
-ECHO activating VS cmd prompt && CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-IF EXIST build ECHO deleting build dir... && RD /Q /S build
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-MKDIR build
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-CD build
-ECHO config^: %config%
-
-SET CMAKE_CMD=cmake .. ^
--LA -G "Visual Studio 15 2017 Win64"
-
-ECHO calling^: %CMAKE_CMD%
-%CMAKE_CMD%
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-SET avlogger=
-IF /I "%APPVEYOR%"=="True" SET avlogger=/logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-
-msbuild vtzero.sln ^
-/p:Configuration=%config% ^
-%avlogger%
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-ctest --output-on-failure ^
--C %config% ^
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-GOTO DONE
-
-:ERROR
-ECHO ~~~~~~ ERROR %~f0 ~~~~~~
-SET EL=%ERRORLEVEL%
-
-:DONE
-IF %EL% NEQ 0 ECHO. && ECHO !!! ERRORLEVEL^: %EL% !!! && ECHO.
-ECHO ~~~~~~ DONE %~f0 ~~~~~~
-
-EXIT /b %EL%
+ at ECHO OFF
+SETLOCAL
+SET EL=0
+
+ECHO ~~~~~~ %~f0 ~~~~~~
+
+::show all available env vars
+SET
+ECHO cmake on AppVeyor
+cmake -version
+
+ECHO activating VS cmd prompt && CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
+IF EXIST build ECHO deleting build dir... && RD /Q /S build
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
+MKDIR build
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
+CD build
+ECHO config^: %config%
+
+SET CMAKE_CMD=cmake .. ^
+-LA -G "Visual Studio 15 2017 Win64"
+
+ECHO calling^: %CMAKE_CMD%
+%CMAKE_CMD%
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
+SET avlogger=
+IF /I "%APPVEYOR%"=="True" SET avlogger=/logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
+msbuild vtzero.sln ^
+/p:Configuration=%config% ^
+%avlogger%
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
+ctest --output-on-failure ^
+-C %config% ^
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
+GOTO DONE
+
+:ERROR
+ECHO ~~~~~~ ERROR %~f0 ~~~~~~
+SET EL=%ERRORLEVEL%
+
+:DONE
+IF %EL% NEQ 0 ECHO. && ECHO !!! ERRORLEVEL^: %EL% !!! && ECHO.
+ECHO ~~~~~~ DONE %~f0 ~~~~~~
+
+EXIT /b %EL%
=====================================
third_party/vtzero/build-msys2.bat
=====================================
@@ -1,18 +1,18 @@
-echo "Adding MSYS2 to path..."
-SET "PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%"
-echo %PATH%
-
-echo "Installing MSYS2 packages..."
-bash -lc "pacman -S --needed --noconfirm mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-boost"
-
-echo "Generating makefiles"
-mkdir build
-cd build
-cmake .. -LA -G "MSYS Makefiles"
-
-echo "Building"
-make VERBOSE=1
-
-echo "Testing"
-ctest --output-on-failure
-
+echo "Adding MSYS2 to path..."
+SET "PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%"
+echo %PATH%
+
+echo "Installing MSYS2 packages..."
+bash -lc "pacman -S --needed --noconfirm mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-boost"
+
+echo "Generating makefiles"
+mkdir build
+cd build
+cmake .. -LA -G "MSYS Makefiles"
+
+echo "Building"
+make VERBOSE=1
+
+echo "Testing"
+ctest --output-on-failure
+
View it on GitLab: https://salsa.debian.org/debian-gis-team/osrm-backend/-/compare/08990b9eb561b2801753c535e7703307d888c5a3...6e76515b410428d4edf9bf841ee16e2ebfa7c1bf
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/osrm-backend/-/compare/08990b9eb561b2801753c535e7703307d888c5a3...6e76515b410428d4edf9bf841ee16e2ebfa7c1bf
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20260502/02a167e6/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list