[ أحمد المحمودي (Ahmed El-Mahmoudy) ] * Merge with Debian unstable (LP: #485956). Remaining Ubuntu changes: - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes. - Add various autoscripts for above: postinst-upstart, postinst-upstart-replace, postinst-upstart-restart, prerm-upstart, prerm-upstart-norestart, preinst-removeconffile. - dh_installudev: Handle conffile migration from old Ubuntu defaults (needed until after the next LTS release).
[ Daniel Holbach ] * Port merge from 7.4.7 to 7.4.10.