Imported Upstream version 0.11.1+ds
Merge tag 'upstream/0.11.1+ds' into debian

Upstream version 0.11.1+ds
Re-roll a new orig.tar.gz for 0.11.1

This one includes all the files with "debian" in their name.

Closes: #697747
Drop the unwanted upstream changes in the debian branch

Any change that we want ought to be managed in debian/patches/.
Update debian/watch to drop the (temporary) +ds suffix