From: Joey Hess <joey@kitenet.net>
Date: Fri, 17 Jun 2011 18:13:05 +0000 (-0400)
Subject: Correct docs about multiarch and v9. Closes: #630826
X-Git-Tag: 8.9.0~8
X-Git-Url: https://git.donarmstrong.com/?p=debhelper.git;a=commitdiff_plain;h=114cecf6e739aa755504eb37eb9ed89e8cab0120

Correct docs about multiarch and v9. Closes: #630826
---

diff --git a/debhelper.pod b/debhelper.pod
index fbb76de..2dbd4a5 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -549,10 +549,7 @@ Changes from v8 are:
 =item - 
 
 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 in
-${misc:Pre-Depends}
+multiarch directories to autoconf in --libdir and --libexecdir.
 
 =item -
 
diff --git a/debian/changelog b/debian/changelog
index 9bf728a..404f03e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ debhelper (8.1.7) UNRELEASED; urgency=low
     Closes: #544844
   * Also, support DEB_BUILD_OPTIONS=noopt, by changing -O2 to -O0
     in any variables listed by dpkg-buildflags.
+  * Correct docs about multiarch and v9. Closes: #630826
 
  -- Joey Hess <joeyh@debian.org>  Sat, 21 May 2011 15:24:19 -0400
 
diff --git a/dh_makeshlibs b/dh_makeshlibs
index 03dd7ab..6e349c3 100755
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -21,7 +21,7 @@ libraries, and generates a shlibs file for the libraries it finds.
 It also adds a call to ldconfig in the F<postinst> and F<postrm> scripts (in
 v3 mode and above only) to any packages in which it finds shared libraries.
 
-In v9 mode and above, packages that support multiarch are detected, and
+Packages that support multiarch are detected, and
 a Pre-Dependency on multiarch-support is set in ${misc:Pre-Depends} ;
 you should make sure to put that token into an appropriate place in your
 debian/control file for packages supporting multiarch.