Try 800x600 as the default EFI video mode
Removed all explicit exporting rules for fields known by
dpkg-dev since 2007.
Merge remote-tracking branch 'upstream/master'