documentation

diff --git a/debhelper.pod b/debhelper.pod
index f541a7e9745e8d3de1d2d85365a4b79b30fc3887..9bb06e74a2e8166e392866137f800fa91883c96e 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -503,6 +503,23 @@ none is specified.
 
 =back
 
+=item v9
+
+This compatability level is still open for development; use with caution.
+
+Changes from v8 are:
+
+=over 8
+
+=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 is
+${misc:Pre-Depends} . A version of dpkg-dev supporting multiarch
+is required for this to work.
+
 =item v8
 
 This is the recommended mode of operation.

diff --git a/debian/changelog b/debian/changelog
index 0a51b2909d6153c51d760509d36bde63a42bc542..b2f9b0ffbda0055bd1eeaef89a19ce52b3bba6df 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,15 @@ debhelper (8.1.3) UNRELEASED; urgency=low
     in some rule other than clean, perhaps to clean up an intermediate
     build before a second build is run, debian/rules clean still runs it.
     Closes: #615553
+  * Started work on Debhelper v9. It is still experimental, and more
+    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.
+  * dh_makeshlibs: Detect packages using multiarch directories and
+    make ${misc:Pre-Depends} expand to multiarch-support. Also needs
+    a new enough dpkg-dev.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Feb 2011 15:43:12 -0400
 

diff --git a/debian/compat b/debian/compat
index 45a4fb75db864000d01701c0f7a51864bd4daabf..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9

diff --git a/dh_makeshlibs b/dh_makeshlibs
index 896c5b3e3525aea036c5de874f3e3e0857c61551..9880211df100f02f71b7e95ba18a215a24a7bf26 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -21,6 +21,11 @@ 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
+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.
+
 =head1 FILES
 
 =over 4