aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpbuilderrc11
-rw-r--r--pbuilderrc.510
2 files changed, 13 insertions, 8 deletions
diff --git a/pbuilderrc b/pbuilderrc
index 7ec5f45..1b8da3b 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -35,10 +35,13 @@ BUILDSOURCEROOTCMD="fakeroot"
PBUILDERROOTCMD="sudo"
# command to satisfy build-dependencies; the default is an internal shell
-# implementation which is relatively slow; there's an alternate experimental
-# implementation, "pbuilder-satisfydepends-experimental", which might be useful
-# to pull packages from experimental or from repositories with a low APT Pin
-# Priority
+# implementation which is relatively slow; there are two alternate
+# implementations, the "experimental" implementation,
+# "pbuilder-satisfydepends-experimental", which might be useful to pull
+# packages from experimental or from repositories with a low APT Pin Priority,
+# and the "aptitude" implementation, which will resolve build-dependencies and
+# build-conflicts with aptitude which helps dealing with complex cases but does
+# not support unsigned APT repositories
PBUILDERSATISFYDEPENDSCMD="/usr/lib/pbuilder/pbuilder-satisfydepends"
#default is to build everything. Passed on to dpkg-buildpackage
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 832c5e6..98c2fc5 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -216,10 +216,12 @@ in
.BI "PBUILDERSATISFYDEPENDSCMD=" "/usr/lib/pbuilder/pbuilder-satisfydepends"
This option is used by various parts of pbuilder to satisfy (i.e. install) the
-build-dependencies of a package. There is an alternate experimental
-implementation, "pbuilder-satisfydepends-experimental", which might be useful
-to pull packages from experimental or from repositories with a low APT Pin
-Priority.
+build-dependencies of a package. There are two alternate implementations, the
+"experimental" implementation, "pbuilder-satisfydepends-experimental", which
+might be useful to pull packages from experimental or from repositories with a
+low APT Pin Priority, and the "aptitude" implementation, which will resolve
+build-dependencies and build-conflicts with aptitude which helps dealing with
+complex cases but does not support unsigned APT repositories
.TP
.BI "BUILDUSERID=" "1234"