* rename pbuilder-satisfydepends to pbuilder-satisfydepends-classic, and

  install pbuilder-satisfydepends-aptitude as the deafault
  pbuilder-satisfydepends
* install aptitude per default in chroot.

7 files changed, 34 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 76ea95a..e2432bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-08-28  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilderrc.5 (Example): document
+	pbuilder-satisfydepends-aptitude as the default.
+
+	* pbuilder-updatebuildenv: install aptitude per default.
+	* pbuilder-createbuildenv: install aptitude per default.
+
+	* pbuilder-satisfydepends-classic: rename to '-classic'.
+
 2007-08-20  Junichi Uekawa  <dancer@debian.org>
 
 	* Makefile: update makefile to install lvmbuilder
diff --git a/Makefile b/Makefile
index 54f9f79..21a5e19 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ SHELLCODES=pbuilder-buildpackage \
 	pbuilder-loadconfig \
 	pbuilder-modules \
 	pbuilder-runhooks \
-	pbuilder-satisfydepends \
+	pbuilder-satisfydepends-classic \
 	pbuilder-satisfydepends-funcs \
 	pbuilder-satisfydepends-checkparams \
 	pbuilder-satisfydepends-aptitude \
@@ -76,7 +76,10 @@ install:
 	$(INSTALL_EXECUTABLE) pbuilder-user-mode-linux $(DESTDIR)/usr/bin
 	$(INSTALL_EXECUTABLE) pdebuild-user-mode-linux $(DESTDIR)/usr/bin
 	$(INSTALL_EXECUTABLE) debuild-pbuilder $(DESTDIR)/usr/bin
-	$(INSTALL_EXECUTABLE) pbuilder-satisfydepends $(DESTDIR)/usr/lib/pbuilder/
+
+	#install aptitude as the default satisfydepends 
+	$(INSTALL_EXECUTABLE) pbuilder-satisfydepends-aptitude $(DESTDIR)/usr/lib/pbuilder/pbuilder-satisfydepends
+	$(INSTALL_EXECUTABLE) pbuilder-satisfydepends-classic $(DESTDIR)/usr/lib/pbuilder/
 	$(INSTALL_EXECUTABLE) pbuilder-satisfydepends-aptitude $(DESTDIR)/usr/lib/pbuilder/
 	$(INSTALL_EXECUTABLE) pbuilder-satisfydepends-experimental $(DESTDIR)/usr/lib/pbuilder/
 	$(INSTALL_EXECUTABLE) pbuilder-satisfydepends-checkparams $(DESTDIR)/usr/lib/pbuilder/
diff --git a/debian/changelog b/debian/changelog
index 44f2d6d..c05e701 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,12 @@ pbuilder (0.172) UNRELEASED; urgency=low
 
   [ Junichi Uekawa ]
   * update lvmpbuilder, thanks to Kapil Hari Paranjape (closes: #389884)
+  * rename pbuilder-satisfydepends to pbuilder-satisfydepends-classic, and
+    install pbuilder-satisfydepends-aptitude as the deafault
+    pbuilder-satisfydepends
+  * install aptitude per default in chroot.
 
- -- Junichi Uekawa <dancer@debian.org>  Mon, 20 Aug 2007 08:01:04 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Tue, 28 Aug 2007 09:30:55 +0900
 
 pbuilder (0.171) unstable; urgency=low
 
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 5ccc73e..770fe60 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -88,7 +88,7 @@ if [ -n "$REMOVEPACKAGES" ]; then
 fi
 recover_aptcache
 $CHROOTEXEC /usr/bin/apt-get -y --force-yes "${FORCE_CONFNEW[@]}" dist-upgrade
-$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt aptitude $EXTRAPACKAGES
 save_aptcache
 
 executehooks "E"
diff --git a/pbuilder-satisfydepends b/pbuilder-satisfydepends-classic
index dfd6850..8a37603 100755
--- a/pbuilder-satisfydepends
+++ b/pbuilder-satisfydepends-classic
@@ -18,6 +18,8 @@
 #
 # module to satisfy build dependencies; default flavor
 
+# The original pbuilder-satisfydepends code, which is now called 'classic'
+
 set -e
 
 . /usr/lib/pbuilder/pbuilder-satisfydepends-funcs
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index bc6f2a0..88c8f62 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -45,7 +45,7 @@ recover_aptcache
 
 $TRAP saveaptcache_umountproc_cleanbuildplace_trap exit sighup
 $CHROOTEXEC /usr/bin/apt-get -y --force-yes "${FORCE_CONFNEW[@]}" dist-upgrade 
-$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt aptitude $EXTRAPACKAGES
 save_aptcache
 
 # optionally auto-clean apt-cache
diff --git a/pbuilderrc.5 b/pbuilderrc.5
index 92c2146..9972f64 100644
--- a/pbuilderrc.5
+++ b/pbuilderrc.5
@@ -260,13 +260,16 @@ in
 .TP
 .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 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
+This option is used by various parts of pbuilder to satisfy
+(i.e. install) the build-dependencies of a package.  There are three
+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, 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, and the "classic" implementation, which is the original
+implementation used until 0.172. The default is now "aptitude".
 
 .TP
 .BI "BUILDUSERID=" "1234"