Merge lp:~rcj/livecd-rootfs/trunk

This commit is contained in:
Steve Langasek 2018-06-08 10:36:28 -07:00
commit 0e308cb2ec
2 changed files with 7 additions and 1 deletions

6
debian/changelog vendored
View File

@ -5,6 +5,12 @@ livecd-rootfs (2.532) cosmic; urgency=medium
-- Daniel Watkins <oddbloke@ubuntu.com> Thu, 07 Jun 2018 11:11:02 -0700
livecd-rootfs (2.531ubuntu1) cosmic; urgency=medium
* ubuntu-cpc: Remove git-man for minimized images
-- Robert C Jennings <robert.jennings@canonical.com> Fri, 08 Jun 2018 10:10:53 -0700
livecd-rootfs (2.531) cosmic; urgency=medium
[ Daniel Watkins ]

View File

@ -149,7 +149,7 @@ if [ "${SUBPROJECT:-}" = minimized ]; then
# FIXME: iso-codes is a dep of software-properties and shouldn't be
_xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \
apt-get -y autoremove --purge iso-codes xauth pastebinit \
plymouth open-vm-tools git shared-mime-info vim vim-common \
plymouth open-vm-tools git git-man shared-mime-info vim vim-common \
console-setup ncurses-term tmux screen policykit-1 \
xdg-user-dirs less publicsuffix run-one apport-symptoms \
ubuntu-cloudimage-keyring file