Forráskód Böngészése

scripts: Move "(default)" annotations in --help output after option description

Guillem Jover 11 éve
szülő
commit
292a21f821
3 módosított fájl, 6 hozzáadás és 4 törlés
  1. 2 0
      debian/changelog
  2. 3 3
      scripts/dpkg-buildpackage.pl
  3. 1 1
      scripts/dpkg-genchanges.pl

+ 2 - 0
debian/changelog

@@ -126,6 +126,8 @@ dpkg (1.18.0) UNRELEASED; urgency=low
   * Add dpkg --ctrl-tarfile forwarding command for dpkg-deb.
   * Add dpkg --ctrl-tarfile forwarding command for dpkg-deb.
   * Disable dependency checks on dpkg-buildpackage -S -nc.
   * Disable dependency checks on dpkg-buildpackage -S -nc.
   * Make dependency checks fatal for dpkg-buildpackage -S.
   * Make dependency checks fatal for dpkg-buildpackage -S.
+  * Move "(default)" annotations in scripts --help output after option
+    description.
 
 
   [ Raphaël Hertzog ]
   [ Raphaël Hertzog ]
   * Drop myself from Uploaders.
   * Drop myself from Uploaders.

+ 3 - 3
scripts/dpkg-buildpackage.pl

@@ -59,7 +59,7 @@ sub usage {
 'Usage: %s [<option>...]')
 'Usage: %s [<option>...]')
     . "\n\n" . g_(
     . "\n\n" . g_(
 'Options:
 'Options:
-  -F (default)   normal full build (binaries and sources).
+  -F             normal full build (binaries and sources, default).
   -g             source and arch-indep build.
   -g             source and arch-indep build.
   -G             source and arch-specific build.
   -G             source and arch-specific build.
   -b             binary-only, no source files.
   -b             binary-only, no source files.
@@ -68,7 +68,7 @@ sub usage {
   -S             source-only, no binary files.
   -S             source-only, no binary files.
   -nc            do not clean source tree (implies -b).
   -nc            do not clean source tree (implies -b).
   -tc            clean source tree when finished.
   -tc            clean source tree when finished.
-  -D (default)   check build dependencies and conflicts.
+  -D             check build dependencies and conflicts (default).
   -d             do not check build dependencies and conflicts.
   -d             do not check build dependencies and conflicts.
   -P<profiles>   assume given build profiles as active (comma-separated list).
   -P<profiles>   assume given build profiles as active (comma-separated list).
   -R<rules>      rules file to execute (default is debian/rules).
   -R<rules>      rules file to execute (default is debian/rules).
@@ -106,7 +106,7 @@ sub usage {
       --target-type <type>  set the target GNU system type.')
       --target-type <type>  set the target GNU system type.')
     . "\n\n" . g_(
     . "\n\n" . g_(
 'Options passed to dpkg-genchanges:
 'Options passed to dpkg-genchanges:
-  -si (default)  source includes orig, if new upstream.
+  -si            source includes orig, if new upstream (default).
   -sa            source includes orig, always.
   -sa            source includes orig, always.
   -sd            source is diff and .dsc only.
   -sd            source is diff and .dsc only.
   -v<version>    changes since version <version>.
   -v<version>    changes since version <version>.

+ 1 - 1
scripts/dpkg-genchanges.pl

@@ -146,7 +146,7 @@ sub usage {
   -m<maintainer>           override control's maintainer value.
   -m<maintainer>           override control's maintainer value.
   -e<maintainer>           override changelog's maintainer value.
   -e<maintainer>           override changelog's maintainer value.
   -u<upload-files-dir>     directory with files (default is '..').
   -u<upload-files-dir>     directory with files (default is '..').
-  -si (default)            source includes orig, if new upstream.
+  -si                      source includes orig, if new upstream (default).
   -sa                      source includes orig, always.
   -sa                      source includes orig, always.
   -sd                      source is diff and .dsc only.
   -sd                      source is diff and .dsc only.
   -q                       quiet - no informational messages on stderr.
   -q                       quiet - no informational messages on stderr.