diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | scripts/Dpkg/Build/Types.pm | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index de40e2e23..700f69715 100644 --- a/debian/changelog +++ b/debian/changelog @@ -118,6 +118,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - Document the Testsuite and Testsuite-Triggers fields in deb-src-control(5). Prompted by Mattia Rizzolo <mattia@debian.org>. - Update git URLs for move away from alioth.debian.org. + - Fix set_build_type_from_options() description in Dpkg::Build::Types. * 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/Build/Types.pm b/scripts/Dpkg/Build/Types.pm index 45a81d3ba..b6c2366f3 100644 --- a/scripts/Dpkg/Build/Types.pm +++ b/scripts/Dpkg/Build/Types.pm @@ -193,9 +193,10 @@ sub set_build_type $current_option = $build_option; } -=item set_build_type_from_options($build_type, $build_option, %opts) +=item set_build_type_from_options($build_types, $build_option, %opts) -Set the current build type from a list of build type components. +Set the current build type from a list of comma-separated build type +components. The function will check and abort on incompatible build type assignments, this behavior can be disabled by using the boolean option "nocheck". |