From 17935684f68bb4feff046ad35b501a9fdb0b08ac Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 3 Oct 2007 16:46:14 +0200 Subject: [PATCH] Import patches-unapplied version 0.37 to ubuntu/gutsy Imported using git-ubuntu import. Changelog parent: ce983b02a7eeb7a67e62aeef3b12d195dcbfa60c New changelog entries: * Run fdupes on ${ROOT}/usr. --- debian/changelog | 6 ++++++ debian/control | 2 +- livecd.sh | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2c67e04e..34979da9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.37) gutsy; urgency=low + + * Run fdupes on ${ROOT}/usr. + + -- Matthias Klose Wed, 03 Oct 2007 16:46:14 +0200 + livecd-rootfs (0.36) gutsy; urgency=low * Change the names of ia64 kernels to the right (non-SMP since they're diff --git a/debian/control b/debian/control index db1e6c5b..282ac5a2 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.1.0 Package: livecd-rootfs Architecture: all -Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools, grep-dctrl +Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools, grep-dctrl, fdupes Suggests: partimage Description: construction script for the livecd rootfs livecd-rootfs provides the script used to create the root filesystem diff --git a/livecd.sh b/livecd.sh index c3336c3b..11c77590 100755 --- a/livecd.sh +++ b/livecd.sh @@ -381,6 +381,13 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP} # And now that we're done messing with debconf, destroy the backup files: rm -f ${ROOT}/var/cache/debconf/*-old + # search for duplicate files, write the summary to stdout, + if which fdupes >/dev/null 2>&1; then + echo BEGIN fdupes + fdupes --recurse --noempty --sameline --size --quiet ${ROOT}/usr + echo END fdupes + fi + # Dirty hack to mark langpack stuff as manually installed perl -i -nle 'print unless /^Package: language-(pack|support)/ .. /^$/;' \ ${ROOT}/var/lib/apt/extended_states