Author: adsb
Date: 2008-12-14 14:01:10 +0000 (Sun, 14 Dec 2008)
New Revision: 1765
Modified:
trunk/debian/changelog
trunk/scripts/debdiff.1
trunk/scripts/debdiff.pl
Log:
* debdiff:
+ Fix a couple of formatting issues in the manpage.
+ Mention --{no-,}diffstat in the help message.
+ Don't treat "DEBDIFF_SHOW_DIFFSTAT=no" as a modification from default
settings.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-12-13 19:17:20 UTC (rev 1764)
+++ trunk/debian/changelog 2008-12-14 14:01:10 UTC (rev 1765)
@@ -1,5 +1,10 @@
devscripts (2.10.44) UNRELEASED; urgency=low
+ * debdiff:
+ + Fix a couple of formatting issues in the manpage.
+ + Mention --{no-,}diffstat in the help message.
+ + Don't treat "DEBDIFF_SHOW_DIFFSTAT=no" as a modification from default
+ settings.
* licensecheck: Add .cs (C# source files) to the default list of files to
check. (Closes: #508163)
* conf.default.in: Use the new reportbug.debian.org as an example SMTP host
Modified: trunk/scripts/debdiff.1
===================================================================
--- trunk/scripts/debdiff.1 2008-12-13 19:17:20 UTC (rev 1764)
+++ trunk/scripts/debdiff.1 2008-12-14 14:01:10 UTC (rev 1765)
@@ -128,7 +128,7 @@
.B \-\-diffstat
Include the result of \fBdiffstat\fR before the generated diff.
.TP
-.B \-\-no-\diffstat
+.B \-\-no\-diffstat
The default behaviour; can be used to override a configuration file
setting.
.TP
@@ -188,6 +188,7 @@
.B DEBDIFF_SHOW_DIFFSTAT
If this is set to \fIyes\fR, then it is the same as the
\fB\-\-diffstat\fR command line parameter being used.
+.TP
.B DEBDIFF_WDIFF_SOURCE_CONTROL
If this is set to \fIyes\fR, then it is the same as the
\fB\-\-wdiff\-source\-control\fR command line parameter being used.
@@ -200,7 +201,7 @@
.SH "SEE ALSO"
.BR dpkg-deb (1),
.BR wdiff (1),
-.BR interdiff (1)
+.BR interdiff (1),
.BR diffstat (1)
and
.BR devscripts.conf (5).
Modified: trunk/scripts/debdiff.pl
===================================================================
--- trunk/scripts/debdiff.pl 2008-12-13 19:17:20 UTC (rev 1764)
+++ trunk/scripts/debdiff.pl 2008-12-14 14:01:10 UTC (rev 1765)
@@ -77,6 +77,8 @@
--quiet, -q Be quiet if no differences were found
--exclude PATTERN Exclude files that match PATTERN
--ignore-space, -w Ignore whitespace in diffs
+ --diffstat Include the result of diffstat before the diff
+ --no-diffstat Do not do so (default)
--auto-ver-sort When comparing source packages, ensure the
comparison is performed in version order (default)
--no-auto-ver-sort Do not do so
@@ -124,7 +126,7 @@
'DEBDIFF_CONTROLFILES' => 'control',
'DEBDIFF_SHOW_MOVED' => 'no',
'DEBDIFF_WDIFF_OPT' => '',
- 'DEBDIFF_SHOW_DIFFSTAT' => '',
+ 'DEBDIFF_SHOW_DIFFSTAT' => 'no',
'DEBDIFF_WDIFF_SOURCE_CONTROL' => 'no',
);
my %config_default = %config_vars;
--
To unsubscribe, send mail to [email protected].
