[Ubuntu] unable to build qgis 3.44.8 for ubuntugis

[Martin Landa]

Dear Bas,

st 8. 4. 2026 v 19:44 odesílatel Sebastiaan Couwenberg via Ubuntu <
ubuntu at lists.osgeo.org> napsal:

> Looks like the patches are applied in git which they shouldn't be.
>
> I suspect you didn't resolve merge conflicts correctly.
>

Yes, `git merge` produced several conflicts:

Auto-merging debian/changelog
CONFLICT (content): Merge conflict in debian/changelog
Auto-merging debian/control
CONFLICT (content): Merge conflict in debian/control
Auto-merging doc/developersmap.html
CONFLICT (content): Merge conflict in doc/developersmap.html
Auto-merging external/nlohmann/json.hpp
...

I solved conflicts by applying changes from debian/3.44.8+dfsg-1 by `git
checkout --theirs .`.

When running `gbp buildpackage` I got errors above.

I removed exclude-elvensword-resources.patch,
exclude-cc-by-nc-resources.patch and spelling-errors.patch patches, which
are failing. But it still fails:

dpkg-source: info: local changes detected, the modified files are:
 qgis/ChangeLog
 qgis/python/core/auto_generated/symbology/qgsrenderer.sip.in
 qgis/resources/cpt-city-qgis-min/selections/blues.xml
 qgis/resources/cpt-city-qgis-min/selections/div.xml
 qgis/resources/cpt-city-qgis-min/selections/greens.xml
 qgis/resources/cpt-city-qgis-min/selections/greys.xml
 qgis/resources/cpt-city-qgis-min/selections/reds.xml
 qgis/resources/cpt-city-qgis-min/selections/transparency.xml
 qgis/src/core/symbology/qgsrenderer.h
 qgis/tests/testdata/plugindependencies_data.json
dpkg-source: error: aborting due to unexpected upstream changes, see
/data/tmp/qgis_3.44.8+dfsg-1~noble1.diff.VvNECR
dpkg-source: hint: make sure the version in debian/changelog matches the
unpacked source tree
dpkg-source: hint: you can integrate the local changes with dpkg-source
--commit
gbp:error: 'git-pbuilder -sa' failed: it exited with 2

Not sure what I am doing wrong...

Best regards, Martin

-- 
Martin Landa
https://geomatics.fsv.cvut.cz/en/employees/martin-landa/
https://gismentors.cz/mentors/landa
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/ubuntu/attachments/20260409/48ed1928/attachment-0001.htm>