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.

diff --git a/ChangeLog b/ChangeLog
index 82ad1003881d442003c8e09ec0b4ba3691dc6761..5cadbafc191a7fced240a462da053f143b9e989d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 
 2007-10-09  Frank Lichtenheld  <djpig@debian.org>
 
+       * 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 f876f15b1d2cbc9d491d6620ad75e7624810ef44..d92fed25fdf828b15b9ef2c97101a12decf48d74 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,5 +1,10 @@
 2007-10-09  Frank Lichtenheld  <djpig@debian.org>
 
+       * 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 d53a52eec5478bbe097e3c60080fdd69d1a0e80d..504145703c584fa1c99ce999a97bb54de44ce4a2 100644 (file)
--- 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 b526417a33bff47595f82eb6d713591fcd0f8952..5ae6c968daa66abbd2f9872f1b78456abae827fc 100644 (file)
--- 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 f72454438bfc2a65b13d6678c3e6d97d1a7034b7..6e837416ab3b47f0f0a0d8263083f49bb4e0e0aa 100644 (file)
--- 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[<regex>]    ignore diffs of files matching regex.    } only passed
   -I[<pattern>]  filter out files when building tarballs. } to dpkg-source
   --admindir=<directory>

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 1a5a44a48ac17054a9f7aa159fa7e2539c017de2..afbd609ac759598107887d255bf3790eca34a1be 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -165,8 +165,8 @@ Build options:
   -T<varlistfile>          read variables here, not debian/substvars.
   -D<field>=<value>        override or add a .dsc field and value.
   -U<field>                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[<regexp>]             filter out files to ignore diffs of
                              (defaults to: '%s').