qgis: new changes from Debian require merging

[Scott James Remnant (Canonical)]

New changes from Debian require merging into Ubuntu.

Some, if not all, of this work has been done automatically;
however the changes should be reviewed before signing and
uploading.

The new source package, along with various patches to aid
your review are available at:

        http://people.ubuntu.com/~scott/ongoing-merge/qgis/

In particular see the REPORT file for details.

 -- Your friendly neighbourhood Merge-O-Matic.

[Matt Zimmerman (mdz)]

Lowering severity of merges for universe packages.

Scott, please deprioritise these in the future as well.

[Colin Watson (cjwatson)]

Synced to Debian version.