* Merge from Debian unstable. Remaining Ubuntu changes: - Re-added .desktop files for all graphical applications (thanks to Phil Bull), updating (removing encoding field and Application category in Categories, both now deprecated) them to validate with latest desktop-file-validate. * Modify Maintainer value to match Debian-Maintainer-Field Spec