Sfoglia il codice sorgente

scripts: Unify build options description in --help output

Guillem Jover 12 anni fa
parent
commit
175ca02107
3 ha cambiato i file con 13 aggiunte e 11 eliminazioni
  1. 2 0
      debian/changelog
  2. 5 5
      scripts/dpkg-buildpackage.pl
  3. 6 6
      scripts/dpkg-genchanges.pl

+ 2 - 0
debian/changelog

@@ -93,6 +93,8 @@ dpkg (1.17.11) UNRELEASED; urgency=low
   * Only print build type once in dpkg-genchanges, instead of once for each
     specified -A or -B option and then yet another time for the general build
     type description.
+  * Unify build options description in --help output for dpkg-buildpackage
+    and dpkg-genchanges.
 
   [ Updated programs translations ]
   * Danish (Joe Dalton). Closes: #754127

+ 5 - 5
scripts/dpkg-buildpackage.pl

@@ -58,8 +58,8 @@ sub usage {
     . "\n\n" . _g(
 'Options:
   -F (default)   normal full build (binaries and sources).
-  -b             binary-only, do not build source.
-  -B             binary-only, no arch-indep files.
+  -b             binary-only, no source files.
+  -B             binary-only, only arch-specific files.
   -A             binary-only, only arch-indep files.
   -S             source-only, no binary files.
   -nc            do not clean source tree (implies -b).
@@ -100,9 +100,9 @@ sub usage {
   -t<system>     set GNU system type.')
     . "\n\n" . _g(
 'Options passed to dpkg-genchanges:
-  -si (default)  source includes orig if new upstream.
-  -sa            uploaded source always includes orig.
-  -sd            uploaded source is diff and .dsc only.
+  -si (default)  source includes orig, if new upstream.
+  -sa            source includes orig, always.
+  -sd            source is diff and .dsc only.
   -v<version>    changes since version <version>.
   -m<maint>      maintainer for package is <maint>.
   -e<maint>      maintainer for release is <maint>.

+ 6 - 6
scripts/dpkg-genchanges.pl

@@ -116,10 +116,10 @@ sub usage {
 'Usage: %s [<option>...]')
     . "\n\n" . _g(
 "Options:
-  -b                       binary-only build - no source files.
-  -B                       arch-specific - no source or arch-indep files.
-  -A                       only arch-indep - no source or arch-specific files.
-  -S                       source-only upload.
+  -b                       binary-only, no source files.
+  -B                       binary-only, only arch-specific files.
+  -A                       binary-only, only arch-indep files.
+  -S                       source-only, no binary files.
   -c<control-file>         get control info from this file.
   -l<changelog-file>       get per-version info from this file.
   -f<files-list-file>      get .deb files list from this file.
@@ -128,8 +128,8 @@ sub usage {
   -m<maintainer>           override control's maintainer value.
   -e<maintainer>           override changelog's maintainer value.
   -u<upload-files-dir>     directory with files (default is '..').
-  -si (default)            src includes orig if new upstream.
-  -sa                      source includes orig src.
+  -si (default)            source includes orig, if new upstream.
+  -sa                      source includes orig, always.
   -sd                      source is diff and .dsc only.
   -q                       quiet - no informational messages on stderr.
   -F<changelog-format>     force changelog format.