From 853dc7860121b8a97efc0e1756597fb9b648bbf4 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Tue, 9 Oct 2007 23:59:39 +0200 Subject: [PATCH] dpkg-source: Update description of -W and -E -W is the default for quite some time already. Adapt the description of -W and -E. Also update the description of this options in dpkg-buildpackage. --- ChangeLog | 5 +++++ man/ChangeLog | 5 +++++ man/dpkg-buildpackage.1 | 8 ++++---- man/dpkg-source.1 | 8 ++++---- scripts/dpkg-buildpackage.pl | 4 ++-- scripts/dpkg-source.pl | 4 ++-- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82ad1003..5cadbafc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ 2007-10-09 Frank Lichtenheld + * scripts/dpkg-source.pl (usage): -W is the default + for quite some time already. Adapt the description of + -W and -E. + * scripts/dpkg-buildpackage.pl (usage): likewise. + * scripts/dpkg-buildpackage.pl: Add -z/-Z to passthrough opts (will be passed to dpkg-source). diff --git a/man/ChangeLog b/man/ChangeLog index f876f15b..d92fed25 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,5 +1,10 @@ 2007-10-09 Frank Lichtenheld + * dpkg-source.1: -W is the default for quite + some time already. Adapt the description of + -W and -E. + * dpkg-buildpackage.1: likewise. + * dpkg-source.1: Change the rest of the man page to not contain any hardcoded .gz references. diff --git a/man/dpkg-buildpackage.1 b/man/dpkg-buildpackage.1 index d53a52ee..50414570 100644 --- a/man/dpkg-buildpackage.1 +++ b/man/dpkg-buildpackage.1 @@ -85,15 +85,15 @@ Check build dependencies and conflicts; abort if unsatisfied. .B \-d Do not check build dependencies and conflicts. .TP -.B \-W -Turn certain errors into warnings. Only \fBdpkg\-source\fP uses this, but +.B \-E +Turn certain warnings into errors. Only \fBdpkg\-source\fP uses this, but .BR dpkg\-buildpackage recognizes it, and passes it thru to .BR dpkg\-source "." .TP -.B \-E +.B \-W Negates a previously set -.BR \-W "." +.BR \-E "." Only \fBdpkg\-source\fP uses this, but .BR dpkg\-buildpackage recognizes it, and passes it thru to diff --git a/man/dpkg-source.1 b/man/dpkg-source.1 index b526417a..5ae6c968 100644 --- a/man/dpkg-source.1 +++ b/man/dpkg-source.1 @@ -101,12 +101,12 @@ Override or add an output control file field. .BI \-U field Remove an output control file field. .TP -.BI \-W -This option turns certain errors into warnings. -.TP .BI \-E +This option turns certain warnings into errors. +.TP +.BI \-W This option negates a previously set -.BR \-W "." +.BR \-E "." .TP .BR \-Z \fIcompression\fP Specify the compression to use for created files (tarballs and diffs). diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index f7245443..6e837416 100644 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -66,8 +66,8 @@ Options: -nc do not clean source tree (implies -b). -tc clean source tree when finished. -ap add pause before starting signature process. - -W turn certain errors into warnings. } passed to - -E when -W is turned on, -E turns it off. } dpkg-source + -E turn certain warnings into errors. } passed to + -W when -E is turned on, -W turns it off. } dpkg-source -i[] ignore diffs of files matching regex. } only passed -I[] filter out files when building tarballs. } to dpkg-source --admindir= diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 1a5a44a4..afbd609a 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -165,8 +165,8 @@ Build options: -T read variables here, not debian/substvars. -D= override or add a .dsc field and value. -U remove a field. - -W turn certain errors into warnings. - -E when -W is enabled, -E disables it. + -E turn certain warnings into errors. + -W when -E is enabled, -W disables it. -q quiet operation, do not print warnings. -i[] filter out files to ignore diffs of (defaults to: '%s'). -- 2.39.5