Import patches-unapplied version 2.408.34 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 84e5eaf9ae0ac374e869d157b1cf8c660a0b1bdd

New changelog entries:
  * Add back pollinate for minimal after it is removed due to a dependency
    on vim-common.  LP: #1779406.
This commit is contained in:
Francis Ginther 2018-06-29 10:42:06 -05:00 committed by usd-importer
parent 84e5eaf9ae
commit b02381a9e1
2 changed files with 10 additions and 0 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.408.34) xenial; urgency=medium
* Add back pollinate for minimal after it is removed due to a dependency
on vim-common. LP: #1779406.
-- Francis Ginther <francis.ginther@canonical.com> Fri, 29 Jun 2018 10:42:06 -0500
livecd-rootfs (2.408.33) xenial; urgency=medium
* Zero fill space in UEFI partitions, too

View File

@ -177,6 +177,9 @@ if [ "${SUBPROJECT:-}" = minimized ]; then
console-setup ncurses-term tmux screen policykit-1 \
xdg-user-dirs less run-one apport-symptoms \
ubuntu-cloudimage-keyring file
# Add back pollinate, which gets removed due to a dependency on vim-common
_xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \
apt-get install --no-install-recommends pollinate
_xchroot "${rootd}" apt clean
fi