Import patches-unapplied version 0.39 to ubuntu/gutsy

Imported using git-ubuntu import.

Changelog parent: d9b4aa1970

New changelog entries:
  * Print the file size in fdupes output as well.

.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
+doko@salsa-20071003155232-f4n9tdezdkcmn21z
+doko@salsa-20071004092543-qzap04qfo6i77h29

.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 :
+doko@salsa-20071003155232-f4n9tdezdkcmn21z line-delta 62386 419 136 :
+doko@salsa-20071004092543-qzap04qfo6i77h29 line-delta 62805 372 137 :

.bzr/repository/knits/5b/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.1.kndx

@@ -87,4 +87,5 @@ cjwatson@canonical.com-20070925113611-20jvhpb5mbgc25ux line-delta 36252 257 82 :
 cjwatson@canonical.com-20070925113702-3c1v808xu8r7dxrz line-delta 36509 217 83 :
 lamont@mib-20070926194801-xpo9hnwvqi53nblb line-delta 36726 285 84 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 line-delta 37011 300 37 :
-doko@salsa-20071003155232-f4n9tdezdkcmn21z fulltext 37311 5041 85 :
+doko@salsa-20071003155232-f4n9tdezdkcmn21z fulltext 37311 5041 85 :
+doko@salsa-20071004092543-qzap04qfo6i77h29 line-delta 42352 268 87 :

.bzr/repository/knits/5f/x_%4ca%4dont_%4aones_%3clamont.jones@canonical.com%3e_%54hu_%4aan__6_23%3a41%3a24_2005_11810.5.kndx

@@ -94,4 +94,5 @@ cjwatson@canonical.com-20070908215623-im1lmyr5iz9iebq2 line-delta 61155 220 89 :
 cjwatson@canonical.com-20070925113611-20jvhpb5mbgc25ux line-delta 61375 166 90 :
 lamont@mib-20070926194432-f8un38pb6snfs55t line-delta 61541 221 91 :
 Arch-1:lamont.jones@canonical.com--2005-master%livecd-rootfs--mainline--0.24--patch-13 line-delta 61762 204 46 :
-doko@salsa-20071003155232-f4n9tdezdkcmn21z line-delta 61966 277 92 :
+doko@salsa-20071003155232-f4n9tdezdkcmn21z line-delta 61966 277 92 :
+doko@salsa-20071004092543-qzap04qfo6i77h29 line-delta 62243 376 94 :

.bzr/repository/revisions.kndx

@@ -137,4 +137,5 @@ cjwatson@canonical.com-20070925113611-20jvhpb5mbgc25ux fulltext 44718 375 132 :
 cjwatson@canonical.com-20070925113702-3c1v808xu8r7dxrz fulltext 45093 354 133 :
 lamont@mib-20070926194432-f8un38pb6snfs55t fulltext 45447 408 134 :
 lamont@mib-20070926194801-xpo9hnwvqi53nblb fulltext 45855 357 135 :
-doko@salsa-20071003155232-f4n9tdezdkcmn21z fulltext 46212 452 136 :
+doko@salsa-20071003155232-f4n9tdezdkcmn21z fulltext 46212 452 136 :
+doko@salsa-20071004092543-qzap04qfo6i77h29 fulltext 46664 463 137 :

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (0.39) gutsy; urgency=low
+
+  * Print the file size in fdupes output as well.
+
+ -- Matthias Klose <doko@ubuntu.com>  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.

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: <total size for dupes> <different dupes> <all dupes>"
-	echo "data lines: <size for dupes> <number of dupes> <filename> [<filename> ...]"
+	echo "data lines: <size for dupes> <number of dupes> <file size> <filename> [<filename> ...]"
 	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