diff options
| -rw-r--r-- | debhelper.pod | 5 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/debhelper.pod b/debhelper.pod index 9bb06e74..7c88f368 100644 --- a/debhelper.pod +++ b/debhelper.pod @@ -516,9 +516,8 @@ Changes from v8 are: Multiarch support. In particular, B<dh_auto_configure> passes multiarch directories to autoconf in --libdir and --libexecdir, while B<dh_makeshlibs> detects packages containing multiarch -directories and sets a Pre-Dependency on multiarch-support is -${misc:Pre-Depends} . A version of dpkg-dev supporting multiarch -is required for this to work. +directories and sets a Pre-Dependency on multiarch-support in +${misc:Pre-Depends} =item v8 diff --git a/debian/changelog b/debian/changelog index b2f9b0ff..2f6fba05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,11 +8,12 @@ debhelper (8.1.3) UNRELEASED; urgency=low changes may be added to that mode. * Support multiarch in v9. Thanks, Steve Langasek. Closes: #617761 * dh_auto_configure: Support multiarch in v9 by passing multiarch - directories to --libdir and --libexecdir. dpkg-dev (>= 1.16.0) - is needed for this to be done, so packages should build-depend on it. + directories to --libdir and --libexecdir. * dh_makeshlibs: Detect packages using multiarch directories and - make ${misc:Pre-Depends} expand to multiarch-support. Also needs - a new enough dpkg-dev. + make ${misc:Pre-Depends} expand to multiarch-support. + * Depend on dpkg-dev (>= 1.16.0) for multiarch support. Note to backporters: + If you remove that dependency, debhelper will fall back to not doing + multiarch stuff in v9 mode, which is probably what you want. -- Joey Hess <joeyh@debian.org> Sun, 27 Feb 2011 15:43:12 -0400 diff --git a/debian/control b/debian/control index cdf7489c..202f4180 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Homepage: http://kitenet.net/~joey/code/debhelper/ Package: debhelper Architecture: all -Depends: ${perl:Depends}, ${misc:Depends}, perl-base (>= 5.10), file (>= 3.23), dpkg-dev (>= 1.14.19), html2text, binutils, po-debconf, man-db (>= 2.5.1-1) +Depends: ${perl:Depends}, ${misc:Depends}, perl-base (>= 5.10), file (>= 3.23), dpkg-dev (>= 1.16.0), html2text, binutils, po-debconf, man-db (>= 2.5.1-1) Suggests: dh-make Conflicts: dpkg-cross (<< 1.18), python-support (<< 0.5.3), python-central (<< 0.5.6) Description: helper programs for debian/rules |