* Resynchronise with Debian. Remaining changes: - Add setfont, kbd_mode, and loadkeys to initramfs for console-setup. - Use ckbcomp to get the keyboard layout if other data files are not available. - Depend on console-setup, and remove config file; we now only support systems using console-setup and so it no longer serves a purpose. The removed config file for console-screen has changed names from /etc/init.d/console-screen.kbd.sh to /etc/init.d/kbd. - Change loadkeys to find any console not in raw mode when invoked without an explicit console parameter, in case the foreground console is in raw mode. - Simplify maintainer scripts for conffile removal, using new features in debhelper 8.1.0. - Build-depend on gettext:any, since we only need it to run tools at build-time. - Fix cross-building: + Use dh_auto_configure. + Pass CC=$(DEB_HOST_GNU_TYPE)-gcc when cross-building contrib. * Fix some previous mismerges and tidy up Ubuntu-specific patches.