[Git][debian-gis-team/qgis][ubuntu/noble] partialy revert f9abe8ab91291b8814faf9418aeec9352d7863e7

[Sebastiaan Couwenberg]

On 4/9/26 12:41 PM, Martin Landa wrote:
> čt 9. 4. 2026 v 12:37 odesílatel Sebastiaan Couwenberg <sebastic at xs4all.nl>
> napsal:
> 
>> On 4/9/26 12:08 PM, Martin Landa (@martinl-guest) wrote:
>>> - ChangeLog
>>
>> The file is part of the upstream tree (not under debian/) and should be
>> unpatched.
>>
> 
> Yes, the file is located in the upstream tree. Sorry, I don't understand
> what is wrong. Martin

You reverted changes that you shouldn't have.

I mentioned these three files which you initially reverted the changes for:

- debian/changelog
- debian/control
- debian/gbp.conf

Then you modified:

- ChangeLog
- debian/changelog
- debian/control

The fix is:

  git diff debian/3.44.8+dfsg-1 origin/ubuntu/noble ChangeLog | patch -p1 -R

Kind Regards,

Bas

-- 
  PGP Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1