Hello, I've added more buildsystem changes as 3 commits, see commit messages for details : - update dependencies - final removal of gcc10 patch (fixed by upstream changes) - replacing the redirection script with a symlink for bcalm
The new gcc compilation errors you noticed are related to an internal hashmap library ; its code did not age well. Replacing it with something more modern is planned long-term. In the meantime I fixed the most worrying warnings in a patch release of kissplice (2.6.1). I merged the new release in the salsa repository using `gbp import-orig --uscan`, and this was sufficient to fix the compilation error. Unfortunately while using gbp import-orig I did not notice that my upstream branch was not up-to-date with the gitlab one. The result is that my upstream branch (merged to master) has diverged with origin/upstream and cannot be pushed. What is the best way to fix this rookie mistake ? Force push to upstream, or merge commit ? Looking at the git history this kind of error already happened around the 2.5.0 release... The CI now fails because of dh_installdocs : https://salsa.debian.org/med-team/kissplice/-/jobs/2642625 . The current CMake setup will compile and install a user_guide.pdf to /usr/share/doc/kissplice/user_guide.pdf . Should the entry in debian/docs be simply removed ? Regards, François Gindraud ----- Mail original ----- > De: "Andreas Tille" <andr...@fam-tille.de> > À: "Francois Gindraud" <francois.gindr...@inria.fr> > Cc: "debian-med" <debian-med@lists.debian.org> > Envoyé: Vendredi 1 Avril 2022 14:04:28 > Objet: Re: New kissplice version (2.6.0) and packaging changes > Hi Francois, > > Am Thu, Mar 31, 2022 at 11:28:16AM +0200 schrieb Francois Gindraud: >> The new version of kissplice (2.6.0) has been published upstream. >> Due to internal build system and infrastructure changes, the packaging >> infrastructure requires a few changes. >> I had initially contacted Andreas Tille to signal that ahead of time ( [ >> https://alioth-lists.debian.net/pipermail/debian-med-packaging/2022-March/098822.html >> | >> https://alioth-lists.debian.net/pipermail/debian-med-packaging/2022-March/098822.html >> ] ). >> >> I've prepared a commit with changes to [ >> https://salsa.debian.org/med-team/kissplice | >> https://salsa.debian.org/med-team/kissplice ] which should handle all >> build-system changes. >> >> I have not retrieved the new version from the upstream gitlab, as it seems to >> rely on automated git scripts I am not familiar with. > > Huh, a simple `git clone` should work. > >> In his reply, Andreas said to simply push my changes to master, but this >> seem to >> require access that I do not yet have. I've sent an access request to >> DebianMed. > > Ups, sorry, it seems the new gitlab did not sent any information mail > about the pending access request. I confirmed now. Please note that > I've meanwhile pushed some changes for the new upstream version. Please > also note that it does not build due to gcc errors: > > https://salsa.debian.org/med-team/kissplice/-/jobs/2627463 > > I've deactivated the gcc-10.patch > > > https://salsa.debian.org/med-team/kissplice/-/blob/master/debian/patches/gcc10.patch > > which did not apply any more but it might read that the code you are > using now is not fit for gcc-12. > > Kind regards > > Andreas. > > -- > http://fam-tille.de
