From 95a961d6f13043d6b981267bb473c97d29c014eb Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 19 Jun 2015 10:50:39 +0200 Subject: [PATCH] * live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early: * live-build/ubuntu-desktop-next/hooks/10-remove-documentation.binary: - don't remove the copyright and manpages on desktop --- debian/changelog | 4 +++- .../hooks/10-remove-documentation.binary | 14 -------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index c1326071..9db13b05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,10 +5,12 @@ livecd-rootfs (2.317) UNRELEASED; urgency=medium - create other needed directories * live-build/ubuntu-desktop-next/includes.chroot: - copy ubuntu-core's include for /etc/hosts and resolv.conf config - * live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early: + * live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early: - copy touch hacks to create needed userdirs (lightdm & usermetrics), the users are added by the script and not the usual postinst so their uderdirs are not created as they should + * live-build/ubuntu-desktop-next/hooks/10-remove-documentation.binary: + - don't remove the copyright and manpages on desktop [ Oliver Grawert ] * allow install of "multi" click packages in 60-install-click.chroot on diff --git a/live-build/ubuntu-desktop-next/hooks/10-remove-documentation.binary b/live-build/ubuntu-desktop-next/hooks/10-remove-documentation.binary index e870e239..0fe6d487 100644 --- a/live-build/ubuntu-desktop-next/hooks/10-remove-documentation.binary +++ b/live-build/ubuntu-desktop-next/hooks/10-remove-documentation.binary @@ -1,19 +1,5 @@ #!/bin/sh -x -echo "I: Remove unneeded files from /usr/share/doc " -find binary/boot/filesystem.dir/usr/share/doc -depth -type f ! -name copyright|xargs rm -f || true -find binary/boot/filesystem.dir/usr/share/doc -empty|xargs rmdir || true -find binary/boot/filesystem.dir/usr/share/doc -type f -exec gzip -9 {} \; - -echo "I: Remove man/info pages" -rm -rf binary/boot/filesystem.dir/usr/share/man \ - binary/boot/filesystem.dir/usr/share/groff \ - binary/boot/filesystem.dir/usr/share/info \ - binary/boot/filesystem.dir/usr/share/lintian \ - binary/boot/filesystem.dir/usr/share/linda \ - binary/boot/filesystem.dir/var/cache/man - - echo "I: Removing /var/lib/apt/lists/*" find binary/boot/filesystem.dir/var/lib/apt/lists/ -type f | xargs rm -f