This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=869d40414e691ad2e7a6b42b48040a2bcd5e0e94 commit 869d40414e691ad2e7a6b42b48040a2bcd5e0e94 Author: Guillem Jover <[email protected]> AuthorDate: Tue Jul 24 00:47:01 2018 +0200 dpkg-buildpackage: Fold --[no-]check-builddeps into short option descriptions This makes it easier to read which long option matches the short option. --- debian/changelog | 2 ++ scripts/dpkg-buildpackage.pl | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 23d0c626b..2ef3fc3f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -144,6 +144,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium state. - Add --build option equivalents for dpkg-buildpackage short build type options in --help output. + - Fold dpkg-buildpackage --[no-]check-builddeps in --help into both -D + and -d option descriptions. * Code internals: - Do not use stringy eval to define different sub implementations, just assign an anonymous sub to the typeglob. diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index 1df9da44e..fec4bd281 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -74,9 +74,8 @@ sub usage { --pre-clean pre clean source tree (default). --no-post-clean do not post clean source tree (default). -tc, --post-clean post clean source tree. - -D check build dependencies and conflicts (default). - -d do not check build dependencies and conflicts. - --[no-]check-builddeps ditto. + -D, --check-builddeps check build dependencies and conflicts (default). + -d, --no-check-builddeps do not check build dependencies and conflicts. --ignore-builtin-builddeps do not check builtin build dependencies. -P, --build-profiles=<profiles> -- Dpkg.Org's dpkg
