Skip to content

WIP: Merge from Debian unstable

Simon McVittie requested to merge smcv/obs-build-debian:merge-from-debian into collabora

We have at least two versions of obs-build apparently in active use in projects: the one in Debian (stretch-backports or unstable) as maintained at https://salsa.debian.org/debian/obs-build, and the older Collabora branch (in this repo) that we maintain for build.collabora.co.uk.

It looks as though the Collabora version has a couple of changes that the one in Debian does not, so when @zumbi deployed the version from Debian on a client's OBS instance, it lost the ability to add a +buildN suffix to binary version numbers based on release: +build<B_CNT> in the project configuration.

Long term, I think we should merge from Debian (that's this merge request) and consider upstreaming the remaining Collabora changes, either to upstream or at least into Debian. The Debian maintainer of obs-build and the Collabora maintainer of obs-build appear to both be @zumbi, so it should be reasonably straightforward for the Collabora maintainer to make this known to the Debian maintainer :-)

In the short term we can either install this merged version on the client's OBS instance, or downgrade to the same Collabora branch that's on build.ccu.

Edited by Simon McVittie

Merge request reports