X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debhelper.pod;h=511b21f4a09cc569d2bfeda5b03c128c28df714d;hb=18a0da8092ea9f3dc48bca92b36f592af25a608d;hp=2a8f5de38c56f3b549e09a437937bd7ad9e49922;hpb=53792690d7e3e4131013bd1fdc0983bc42995685;p=debhelper.git

diff --git a/debhelper.pod b/debhelper.pod
index 2a8f5de..511b21f 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -87,7 +87,7 @@ characters (B<?> and B<*> and B<[>I<..>B<]> character classes) in the files.
 You can also put comments in these files; lines beginning with B<#> are
 ignored.
 
-The syntax of these files is intentionally kept very simple to make then
+The syntax of these files is intentionally kept very simple to make them
 easy to read, understand, and modify. If you prefer power and complexity,
 you can make the file executable, and write a program that outputs
 whatever content is appropriate for a given situation. When you do so,
@@ -257,7 +257,7 @@ is manually specified with the B<--buildsystem> option.
 
 =back
 
-=head1 COMPATABILITY LEVELS
+=head1 COMPATIBILITY LEVELS
 
 From time to time, major non-backwards-compatible changes need to be made
 to debhelper, to keep it clean and well-designed as needs change and its
@@ -271,6 +271,12 @@ F<debian/compat>. For example, to turn on v9 mode:
 
   % echo 9 > debian/compat
 
+Your package will also need a versioned build dependency on a version of
+debhelper equal to (or greater than) the compatibility level your package
+uses. So for compatibility level 9, ensure debian/control has:
+
+  Build-Depends: debhelper (>= 9)
+
 Unless otherwise indicated, all debhelper documentation assumes that you
 are using the most recent compatibility level, and in most cases does not
 indicate if the behavior is different in an earlier compatibility level, so
@@ -500,12 +506,12 @@ B<dh> does not default to enabling --with=python-support
 
 All of the B<dh_auto_>I<*> debhelper programs and B<dh> set
 environment variables listed by B<dpkg-buildflags>, unless
-they are already set. They support DEB_BUILD_OPTIONS=noopt too.
+they are already set.
 
 =item -
 
-B<dh_auto_configure> passes CFLAGS to perl F<Makefile.PL> and
-F<Build.PL>
+B<dh_auto_configure> passes B<dpkg-buildflags> CFLAGS, CPPFLAGS, and
+LDFLAGS to perl F<Makefile.PL> and F<Build.PL>
 
 =item -
 
@@ -615,22 +621,12 @@ act on.
 =head2 udebs
 
 Debhelper includes support for udebs. To create a udeb with debhelper,
-add "B<Package-Type: udeb>" to the package's stanza in F<debian/control>, and
-build-depend on debhelper (>= 4.2). Debhelper will try to create udebs that
-comply with debian-installer policy, by making the generated package files
-end in F<.udeb>, not installing any documentation into a udeb, skipping over
+add "B<Package-Type: udeb>" to the package's stanza in F<debian/control>.
+Debhelper will try to create udebs that comply with debian-installer
+policy, by making the generated package files end in F<.udeb>, not
+installing any documentation into a udeb, skipping over
 F<preinst>, F<postrm>, F<prerm>, and F<config> scripts, etc.
 
-=head2 Build depends
-
-Once your package uses debhelper to build, be sure to add
-debhelper to your Build-Depends line in F<debian/control>. You should
-build-depend on a version of debhelper equal to (or greater than) the
-debhelper compatibility level your package uses. So if your package used
-compatibility level 9:
-
-  Build-Depends: debhelper (>= 9)
-
 =head1 ENVIRONMENT
 
 =over 4