-
Committer:
Bazaar Package Importer
-
Author(s):
Colin Watson
-
Date:
2009-06-15 17:25:16 UTC
-
mfrom:
(0.1.3 sid)
-
Revision ID:
james.westby@ubuntu.com-20090615172516-xtft1i6b2b9l7p2e
Tags: 1.101ubuntu1
* Resynchronise with Debian. Remaining changes:
- Use and depend on the Ubuntu keyring.
- Enable the restricted component by default, unless
apt-setup/restricted is preseeded to false.
- Set up the default sources.list to look in -updates and -security (the
latter from apt-setup/security_host) as well as the unadorned suite;
also -proposed if apt-setup/proposed is true.
- Use Ubuntu kernel image names.
- Allow preseeding base-installer/kernel/override-image to force a given
kernel to be used.
- Install busybox-initramfs rather than busybox.
- Revert Joey's patch to call base-installer.d hooks after running
debootstrap, which broke console-setup's expectation of being able to
insert its configuration file into /target before console-setup is
installed by debootstrap.
- Add armel/imx51 subarchitecture.