summaryrefslogtreecommitdiff
path: root/debhelper.pod
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-05-14 14:25:07 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-05-14 14:25:07 -0400
commit692ac0f0d2b7acc570cd6a5f8cac848109daf026 (patch)
tree595da5b949e88f2e05c44cf755f007dc5bdc2465 /debhelper.pod
parent9803d8bb635132458142416d32273c9c754b2aca (diff)
parent61aa7954cd6c8620ca99a0d7895aa5a6f59d37e0 (diff)
Merge branch 'master' into buildsystems
Conflicts: debian/changelog dh_auto_configure
Diffstat (limited to 'debhelper.pod')
-rw-r--r--debhelper.pod7
1 files changed, 4 insertions, 3 deletions
diff --git a/debhelper.pod b/debhelper.pod
index dad286ee..388453c3 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -62,9 +62,10 @@ debian/control, debhelper will use debian/foo if no debian/package.foo
file can be found.
In some rare cases, you may want to have different versions of these files
-for different architectures. If files named debian/package.foo.arch
-exist, where "arch" is the same as the output of
-"dpkg-architecture -qDEB_HOST_ARCH",
+for different architectures or OSes. If files named debian/package.foo.ARCH
+or debian/package.foo.OS exist, where "ARCH" and "OS" are the same as the
+output of "dpkg-architecture -qDEB_HOST_ARCH" /
+"dpkg-architecture -qDEB_HOST_ARCH_OS",
then they will be used in preference to other, more general files.
In many cases, these config files are used to specify various types of