Merging upstream version 1.11.1+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
1 job for master in 3 minutes and 58 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Deploy
failed #98530
pages

00:03:58

 
Name Stage Failure
failed
pages Deploy
dpkg-source: error: add web/gui/images/ms-icon-310x310.png in debian/source/include-binaries if you want to store the modified binary in the debian tarball
dpkg-source: error: cannot represent change to web/gui/images/ms-icon-70x70.png: binary file contents changed
dpkg-source: error: add web/gui/images/ms-icon-70x70.png in debian/source/include-binaries if you want to store the modified binary in the debian tarball
dpkg-source: error: unrepresentable changes to source
dpkg-buildpackage: error: dpkg-source -i -I -b . subprocess returned exit status 2
debuild: fatal error at line 1182:
dpkg-buildpackage -us -uc -ui -i -I failed
gbp:error: 'debuild -i -I -uc -us' failed: it exited with 29
ERROR: Job failed: exit code 1