From a9ffe6275ee079e2da27838afce7d4258f93ce39 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 4 Oct 2007 12:28:27 +0200 Subject: [PATCH] Import patches-unapplied version 0.39 to ubuntu/gutsy Imported using git-ubuntu import. Changelog parent: d9b4aa1970e8e317b49f24f0d007d86150df09a4 New changelog entries: * Print the file size in fdupes output as well. --- .bzr/branch/revision-history | 3 ++- .bzr/checkout/dirstate | Bin 3445 -> 3445 bytes .bzr/repository/inventory.kndx | 3 ++- .bzr/repository/inventory.knit | Bin 62805 -> 63177 bytes ...hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx | 3 ++- ...hu_%4aan__6_23%3a41%3a24_2005_11810.1.knit | Bin 42352 -> 42620 bytes ...hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx | 3 ++- ...hu_%4aan__6_23%3a41%3a24_2005_11810.5.knit | Bin 62243 -> 62619 bytes .bzr/repository/revisions.kndx | 3 ++- .bzr/repository/revisions.knit | Bin 46664 -> 47127 bytes debian/changelog | 6 ++++++ livecd.sh | 4 ++-- 12 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.bzr/branch/revision-history b/.bzr/branch/revision-history index 53dd29a8..c5847f45 100644 --- a/.bzr/branch/revision-history +++ b/.bzr/branch/revision-history @@ -134,4 +134,5 @@ cjwatson@canonical.com-20070925113611-20jvhpb5mbgc25ux cjwatson@canonical.com-20070925113702-3c1v808xu8r7dxrz lamont@mib-20070926194432-f8un38pb6snfs55t lamont@mib-20070926194801-xpo9hnwvqi53nblb -doko@salsa-20071003155232-f4n9tdezdkcmn21z \ No newline at end of file +doko@salsa-20071003155232-f4n9tdezdkcmn21z +doko@salsa-20071004092543-qzap04qfo6i77h29 \ No newline at end of file diff --git a/.bzr/checkout/dirstate b/.bzr/checkout/dirstate index f98872571609868850323c312f85429ef8119e0c..55d824e270886f6d847a2340d745869fe4eb0805 100644 GIT binary patch delta 468 zcmb7gd*7S3r|q}hbp)1d7-Chy&ZY)~kyf42t9=AL3VD1(bd9FE- * zGH1Q?yn9uB?9UB;ejP8>$*ymbYO>ebZjF^xAq3CJ0T?VfgAPnYKvrqcG;lJ+1~VZQ z8!28yk|fv%_g7f|r)im% Gmwx~x6@Rk; delta 346 zcmb7JLeQ1-&u4Q-S?whauAvj!8H7^JhW%4?7W?D8Mr_1g0tH1U? z&QG#~Y*rx@6eOwAf*}E5QCqDgk)kLq_rXLU3k;+-hP^T89Q1F>KX&Tpy}DP|7ndmw zpIOCLV0M0>?M{yE`o`Ui3n1=&r9u%2DfwU&+N*#-F(_dRueFH<1I|&f@zQ2|Jt_xN gd7GX--v8Q2clDHP&PK^*1!k6@?RIYGyPFT4ZyD=b_W%F@ diff --git a/.bzr/repository/inventory.kndx b/.bzr/repository/inventory.kndx index 8b51e651..f777e365 100644 --- a/.bzr/repository/inventory.kndx +++ b/.bzr/repository/inventory.kndx @@ -137,4 +137,5 @@ cjwatson@canonical.com-20070925113611-20jvhpb5mbgc25ux line-delta 60305 371 132 cjwatson@canonical.com-20070925113702-3c1v808xu8r7dxrz fulltext 60676 1103 133 : lamont@mib-20070926194432-f8un38pb6snfs55t line-delta 61779 304 134 : lamont@mib-20070926194801-xpo9hnwvqi53nblb line-delta 62083 303 135 : -doko@salsa-20071003155232-f4n9tdezdkcmn21z line-delta 62386 419 136 : \ No newline at end of file +doko@salsa-20071003155232-f4n9tdezdkcmn21z line-delta 62386 419 136 : +doko@salsa-20071004092543-qzap04qfo6i77h29 line-delta 62805 372 137 : \ No newline at end of file diff --git a/.bzr/repository/inventory.knit b/.bzr/repository/inventory.knit index 0a284475f23828a0ea6511c7068e9e2416492e90..edd443499e6dcd2fe2d4ece704411721453cc0e9 100644 GIT binary patch delta 384 zcmV-`0e}A0>I2E`1F%)~e;Sj$##C3;UFAy^*_vF#K)DJW+ zMZPBw-budXQO|swcHPtyF09%>02IP3`a%bzTTL;F4vdE_hroud3i|C)dRh7*h;}La zHov|~n;_kidyv!I8FNjL2*s@$?`wux# zxi@ZQId547jwKhQs9;QRT`;Z$Uvg;-TajpJtCiA1SEb?!rIfCce;Mq~9(1F!(Yate z&M9Ar3+!U>$7{rKr~Br3+qt(n$T?l$5)TJw6+)|V_W4}bn=cHbHufF1hf#6R9xjF< zh7^r^9b^+Adj;>ta9aI_`M)V<8J=Vat(6{+o%0$ur+M7QKE!--x&tz(KSuY>QWrfkr_4RMu^_l~4cnJAs z3~_9!Y^|e!w4r9}dY=Mv!CaTEgI%;Z-nEK6T4(!<{eyVC$I*2C;jkY0t#_dP&VP<_A7x1~<^*klww0P<3wO7e@(Fr=3p-kl<#|+ zk_ip^CR6IHjPP~uqk+49THM;-ZPNll>q9S7gJuY*W_-hl zQW7()h0=3rc&)HBm8dy41i`iUlhqA+`+^9P?M+Ow9~wl6Ak|!micKituc?!Fra?So z(5hJG(kQoPwYLYOe{>nVPi=(vc*5o%U^}LGT)-H%#;Ieo_dkjP;3IrFc&j0G2HySp zzFt56h9Q{N{>c34bg{m`SqHdWLR0kzkH6H(WP;c0cWWI zkKK3=xPo=2ogDzd4}?8bbNGaFTr8*8U5e!(L$)4Qw+lYyQUU*`l#$ttGFrBk6G@ws z-l^VEazZf8r0ESh1V5ONtck1Z`v^|<+3O}qr@GQvwL^bPEzeFfgI^C); SS=QSxUc3O8oZv480{{Rnrsq=t delta 9 QcmbRKf$78>rVSq302z=3?f?J) diff --git a/debian/changelog b/debian/changelog index b6c42536..18ffbd7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.39) gutsy; urgency=low + + * Print the file size in fdupes output as well. + + -- Matthias Klose Thu, 04 Oct 2007 12:28:27 +0200 + livecd-rootfs (0.38) gutsy; urgency=low * Avoid the ${ROOT} prefix in fdupes output, compact and sort the output. diff --git a/livecd.sh b/livecd.sh index 72f67589..ff73cd49 100755 --- a/livecd.sh +++ b/livecd.sh @@ -384,11 +384,11 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP} # search for duplicate files, write the summary to stdout, if which fdupes >/dev/null 2>&1; then echo "first line: " - echo "data lines: [ ...]" + echo "data lines: [ ...]" echo BEGIN fdupes (cd $ROOT \ && fdupes --recurse --noempty --sameline --size --quiet usr \ - | awk '/bytes each/ {s=$1} /^usr/ { n+=1; n2+=NF-1; sum+=s*(NF-1); print s*(NF-1),size, NF, $0 } END {print sum, n, n2}' \ + | awk '/bytes each/ {s=$1} /^usr/ { n+=1; n2+=NF-1; sum+=s*(NF-1); print s*(NF-1), NF-1, s, $0 } END {print sum, n, n2}' \ | sort -nr ) echo END fdupes