* Merge *some* changes from Debian package (version 2.8.10.1-3). This should make merges easier. Also fixes LP: #559822. Also merged several patches. * Remove debian/patches/editra_pixmaps.dpatch patch, we don't ship editra anymore. * Remove files which broke update-alternatives (LP: #379573). * Switch to format 3.0 (quilt).