<div dir="ltr"><div>Dear Bas,</div><br><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">st 8. 4. 2026 v 19:44 odesílatel Sebastiaan Couwenberg via Ubuntu <<a href="mailto:ubuntu@lists.osgeo.org">ubuntu@lists.osgeo.org</a>> napsal:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Looks like the patches are applied in git which they shouldn't be.<br>
<br>
I suspect you didn't resolve merge conflicts correctly.<br></blockquote><div><br></div><div>Yes, `git merge` produced several conflicts:</div><div><br></div>Auto-merging debian/changelog<br>CONFLICT (content): Merge conflict in debian/changelog<br>Auto-merging debian/control<br>CONFLICT (content): Merge conflict in debian/control<br>Auto-merging doc/developersmap.html<br>CONFLICT (content): Merge conflict in doc/developersmap.html<br>Auto-merging external/nlohmann/json.hpp</div><div class="gmail_quote gmail_quote_container">...</div><div class="gmail_quote gmail_quote_container"><br></div><div class="gmail_quote gmail_quote_container">I solved conflicts by applying changes from debian/3.44.8+dfsg-1 by `git checkout --theirs .`.</div><div class="gmail_quote gmail_quote_container"><br></div><div class="gmail_quote gmail_quote_container">When running `gbp buildpackage` I got errors above. </div><div class="gmail_quote gmail_quote_container"><br></div><div class="gmail_quote gmail_quote_container">I removed exclude-elvensword-resources.patch, exclude-cc-by-nc-resources.patch and spelling-errors.patch patches, which are failing. But it still fails:</div><div class="gmail_quote gmail_quote_container"><br></div><div class="gmail_quote gmail_quote_container">dpkg-source: info: local changes detected, the modified files are:<br> qgis/ChangeLog<br> qgis/python/core/auto_generated/symbology/<a href="http://qgsrenderer.sip.in">qgsrenderer.sip.in</a><br> qgis/resources/cpt-city-qgis-min/selections/blues.xml<br> qgis/resources/cpt-city-qgis-min/selections/div.xml<br> qgis/resources/cpt-city-qgis-min/selections/greens.xml<br> qgis/resources/cpt-city-qgis-min/selections/greys.xml<br> qgis/resources/cpt-city-qgis-min/selections/reds.xml<br> qgis/resources/cpt-city-qgis-min/selections/transparency.xml<br> qgis/src/core/symbology/qgsrenderer.h<br> qgis/tests/testdata/plugindependencies_data.json<br>dpkg-source: error: aborting due to unexpected upstream changes, see /data/tmp/qgis_3.44.8+dfsg-1~noble1.diff.VvNECR<br>dpkg-source: hint: make sure the version in debian/changelog matches the unpacked source tree<br>dpkg-source: hint: you can integrate the local changes with dpkg-source --commit<br>gbp:error: 'git-pbuilder -sa' failed: it exited with 2<br></div><div><br></div><div>Not sure what I am doing wrong...</div><div><br></div><div>Best regards, Martin</div><div><br></div><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr">Martin Landa<div><a href="https://geomatics.fsv.cvut.cz/en/employees/martin-landa/" target="_blank">https://geomatics.fsv.cvut.cz/en/employees/martin-landa/</a><br><a href="https://gismentors.cz/mentors/landa" target="_blank">https://gismentors.cz/mentors/landa</a></div></div></div></div>