[Git][debian-gis-team/gdal-grass][ubuntu/bionic] Rebuild 2.4.2 for bionic

[Sebastiaan Couwenberg]

On 9/7/19 10:15 PM, Martin Landa wrote:
> so 7. 9. 2019 v 22:13 odesílatel Martin Landa <landa.martin at gmail.com> napsal:
> related question to qgis packaging. debian/3.4.11+dfsg-2 still points
> to 7.6.1.

Where do you see it pointing to 7.6.1?

If you look at the diff since the previous revision, you see all
references to 7.6.1 being changed:

 https://salsa.debian.org/debian-gis-team/qgis/compare/debian%2F3.4.11+dfsg-1...debian%2F3.4.11+dfsg-2

Specifically in this commit:

 https://salsa.debian.org/debian-gis-team/qgis/commit/ad75e62c005b51e4e0d82de2ca9b58e87a13a5c5

Did you resolve the merge conflict incorrectly perhaps?

> Should I merge master into ubuntu/bionic or wait for
> debian/3.4.11+dfsg-3? Thanks. Ma

You should merge debian/3.4.11+dfsg-2 into ubuntu/bionic and fix the
merge conflicts correctly. Compare the branch with the tag (with git
diff) and you should only see the different branch in gbp.conf & Vcs-Git
URL, plus your changelog entries for UbuntuGIS.

Kind Regards,

Bas

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