diffstat for gt5-1.5.0~20101101+bzr28 gt5-1.5.0~20101011+bzr26 ChangeLog | 13 ------ debian/changelog | 10 ---- gt5 | 118 ++++++++++++++++++++++++------------------------------- 3 files changed, 54 insertions(+), 87 deletions(-) diff -Nru gt5-1.5.0~20101101+bzr28/ChangeLog gt5-1.5.0~20101011+bzr26/ChangeLog --- gt5-1.5.0~20101101+bzr28/ChangeLog 2010-11-01 12:36:12.000000000 +0200 +++ gt5-1.5.0~20101011+bzr26/ChangeLog 2010-10-11 10:03:14.000000000 +0300 @@ -1,18 +1,7 @@ -2010-11-01 Jari Aalto - - * gt5 - - Remove extra 'local' statement. Patch thanks to - Stéphane Rosi . - - Correct AWK brace placement in "$1 > 0". Patch thanks to - Stéphane Rosi . - - Remove extra ending semicolons from AWK code. - - Rewrite non-POSIX safe logical if operators "-a, -o" with "&&, ||". - - Add space after each comma in function calls. - 2010-10-11 Jari Aalto * gt5 - - Correct following errors; patch thanks to Stéphane Rosi + - Correct following errors; patch thanks to Stéphane Rosi : + Commandline arguments are not working + gt5_substr_after not declared diff -Nru gt5-1.5.0~20101101+bzr28/debian/changelog gt5-1.5.0~20101011+bzr26/debian/changelog --- gt5-1.5.0~20101101+bzr28/debian/changelog 2010-11-01 12:43:00.000000000 +0200 +++ gt5-1.5.0~20101011+bzr26/debian/changelog 2010-10-11 10:22:24.000000000 +0300 @@ -1,10 +1,3 @@ -gt5 (1.5.0~20101101+bzr28-1) unstable; urgency=low - - * New upstram release. - - Unnecessary 'local'. Useless lines in HTML output (Closes: #600450). - - -- Jari Aalto Mon, 01 Nov 2010 12:43:00 +0200 - gt5 (1.5.0~20101011+bzr26-1) unstable; urgency=low * New upstram release. @@ -16,7 +9,6 @@ - Update to 8. * debian/control - (Build-Depends): update to debhelper 8. - - (Breaks): New. Change from 'Conflict' (Lintian I:). - (Description): Adjust wording slightly. - (Standards-Version): 3.9.1. * debian/copyright @@ -26,7 +18,7 @@ * debian/rules - Clean up and remove targets handled by dh(1). - -- Jari Aalto Mon, 01 Nov 2010 12:40:41 +0200 + -- Jari Aalto Mon, 11 Oct 2010 10:22:24 +0300 gt5 (1.5.0~20091209+bzr25-2) unstable; urgency=low diff -Nru gt5-1.5.0~20101101+bzr28/gt5 gt5-1.5.0~20101011+bzr26/gt5 --- gt5-1.5.0~20101101+bzr28/gt5 2010-11-01 12:36:12.000000000 +0200 +++ gt5-1.5.0~20101011+bzr26/gt5 2010-10-11 10:03:14.000000000 +0300 @@ -557,7 +557,7 @@ [ "$P" ] || P="file: $F1" fi -if [ -z "$CD$F2" ] || [ -z "$F1" ]; then +if [ -z "$CD$F2" -o -z "$F1" ]; then DIFFS=0 fi @@ -591,34 +591,29 @@ Verbose "done" fi + local f + for f in "$F1" "$F2" do [ -f "$f" ] || continue - case "$f" in - *gz) - CAT="gzip -cd" ;; - *bz2) - CAT="bzip2 -cd" ;; - *) - CAT=cat ;; - esac + case "$f" in *gz) CAT="gzip -cd";; *bz2) CAT="bzip2 -cd";; *) CAT=cat;; esac - if [ "$f" ] && [ $ID -le $DIFFS ] ; then + if [ "$f" -a $ID -le $DIFFS ] ; then Verbose "processing \"$(Replace "$f" "$HOME/" "~/")\" ... " $CAT "$f" | sort -k1nr -k2 | "$AWK" ' NR == 1 { - sub(/\/$/,"") + sub(/\/$/,""); P = " "$2"'"$CUT"'" } $1 && /'"$(Replace_all "$CUT" "/" "\\\/")"'/ { - sub(/^/,"'$ID' ") - sub(P," .") - sub(/\/$/,"") - print + sub(/^/,"'$ID' "); + sub(P," ."); + sub(/\/$/,""); + print; }' @@ -642,7 +637,7 @@ } else { - os = $2 + os = $2; on = $3 } on = $3 @@ -658,18 +653,16 @@ printf("%s %s\n", $0, $0) } - size[me] = $1 + me = $3; + size[me] = $1; osize[me] = $2 - me = $3 - e = 0 - - while ( i = index( substr(me, e + 1), "/") ) - e += i; + e = 0; + while ( i = index(substr(me, e+1),"/")) e += i if (e) { - p = substr(me, 1, e - 1) - printf("%s %s %s %s\n", size[p], osize[p], p, $0) + p = substr(me, 1, e-1); + printf("%s %s %s %s\n", size[p], osize[p] ,p, $0) } } ' | sort -k1,1n -k3,3r -k4,4n | @@ -679,43 +672,43 @@ H = '$(date +%s)'-'${SINCE:-0}' print "" - s = H%60 - H /= 60 - m = H%60 - H /= 60 - h = H%24 - d = H/24 + s = H%60; + H /= 60; + m = H%60; + H /= 60; + h = H%24; + d = H/24; timespan = sprintf("%id, %02i:%02i:%02i", d, h, m, s) } function i2h(i) { - E = unit + E = unit; i += 0 # Force to number if ( unit == "K" && i > 999) { - i /= 1024 + i /= 1024; E = "M" } if ( i > 999 ) { - i /= 1024 + i /= 1024; E = "G" } if ( i > 999 ) { - i /= 1024 + i /= 1024; E = "T" } if ( i < 9.95 ) - return sprintf("%.1f%cB", i, E) + return sprintf("%.1f%cB", i, E); else - return sprintf("%.0f%cB", i, E) + return sprintf("%.0f%cB", i, E); } function directory (p, ps, pos, pf) @@ -734,11 +727,8 @@ } else { - if ( ps < pos ) - printf "-%s", i2h(pos - ps) - - if ( ps > pos ) - printf "+%s", i2h(ps - pos) + if ( ps < pos ) printf "-%s",i2h(pos-ps) + if ( ps > pos ) printf "+%s",i2h(ps-pos) } } @@ -756,55 +746,52 @@ if ( pf ) { - for ( i = 0; i < 16; ++i ) - print "\n\n\n\n\n\n\n\n" + for ( i = 0; i < 16; ++i) + print "\n\n\n\n\n\n\n\n"; } } - $1 > 0 { + $1 > 0 + { # Division by zero ... if ( op != $3 ) - directory(op, ops, opos, 1) + directory(op,ops,opos,1); - ops = $1 - opos = $2 - op = $3 - pz = 100 * $4 / ops - e = 0 + ops = $1; + opos = $2; + op = $3; + pz = 100 * $4/ops + e = 0; - while ( j = index( substr($6, e + 1), "/") ) - e += j; + while ( j = index(substr($6,e+1),"/")) e += j; - s = substr($6, e + 1) - children[$3]++ + s = substr($6,e+1) + children[$3]++; - if ( children[$6] ) + if (children[$6]) { s = ""s"/" } else if ( "'"$LINK_FILES"'" ) { - h = ""s"" } if ( pz >= '"$CUT_AT"' && $6 != "." ) { printf "%6s ",i2h($4) - printf "[%5.2f%%] ./%s ", pz, s + printf "[%5.2f%%] ./%s ",pz,s - if ( '$DIFFS' ) + if ('$DIFFS') { if ( $5 == -1 ) - printf "new" + printf "new"; else { - if ( $4 < $5) - printf "-%s", i2h( $5 - $4) - - if ( $4 > $5) - printf "+%s", i2h( $4 - $5) + if ( $4 < $5) printf "-%s",i2h($5-$4) + if ( $4 > $5) printf "+%s",i2h($4-$5) } } @@ -813,7 +800,7 @@ } END { - directory(op, ops, opos) + directory(op,ops,opos) if ( !x ) print " directory seems to be empty\n\n\ngt5 v'"$version ($P)"'" @@ -841,7 +828,6 @@ Verbose "Starting browser ($(Replace "$BROWSER" "$HOME/" "~/")) ... " cp -l $DATA $HOME/.gt5.html 2> /dev/null || cp $DATA $HOME/.gt5.html || exit $? - ${DEBUG+echo} $BROWSER $DATA # End of file