Author: adam-guest
Date: 2008-04-11 19:01:55 +0000 (Fri, 11 Apr 2008)
New Revision: 1328
Modified:
trunk/debian/changelog
trunk/scripts/debdiff.pl
Log:
debdiff:
+ Make the diffstat header for comparisons between two Debian revisions
the same as that between two upstream versions
+ Normalise directory names in all file headers within a diff, not just
the first
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-04-11 05:31:58 UTC (rev 1327)
+++ trunk/debian/changelog 2008-04-11 19:01:55 UTC (rev 1328)
@@ -6,6 +6,11 @@
the message
- When trimming leading whitespace on continuation lines, only spaces
and tabs are considered rather than line breaks (Closes: #475337)
+ * debdiff:
+ + Make the diffstat header for comparisons between two Debian revisions
+ the same as that between two upstream versions
+ + Normalise directory names in all file headers within a diff, not just
+ the first
* debian/control: Suggest instead of Recommending gnuplot
-- Adam D. Barratt <[EMAIL PROTECTED]> Wed, 09 Apr 2008 18:39:33 +0100
Modified: trunk/scripts/debdiff.pl
===================================================================
--- trunk/scripts/debdiff.pl 2008-04-11 05:31:58 UTC (rev 1327)
+++ trunk/scripts/debdiff.pl 2008-04-11 19:01:55 UTC (rev 1328)
@@ -449,7 +449,10 @@
fatal "interdiff -z $diffs[1] $diffs[2] failed!";
} else {
if ($have_diffstat and $show_diffstat) {
- print "diffstat for $diffs[1] $diffs[2]\n\n";
+ my $header = "diffstat for " . basename($diffs[1])
+ . " " . basename($diffs[2]) . "\n\n";
+ $header =~ s/\.diff\.gz//g;
+ print $header;
system("diffstat $filename");
print "\n";
}
@@ -530,15 +533,11 @@
open( DIFF, '<', $filename );
- # replace in first line:
- my $first = <DIFF>;
- $first =~ s/ $dir1\/\Q$sdir1\E/ $sdir1/;
- $first =~ s/ $dir2\/\Q$sdir2\E/ $sdir2/;
- print $first;
-
while(<DIFF>) {
s/^--- $dir1\//--- /;
s/^\+\+\+ $dir2\//+++ /;
+ s/^(diff .*) $dir1\/\Q$sdir1\E/$1 $sdir1/;
+ s/^(diff .*) $dir2\/\Q$sdir2\E/$1 $sdir2/;
print;
}
close DIFF;
--
To unsubscribe, send mail to [EMAIL PROTECTED]
