Merge lp:~lamont/launchpad-buildd/lp-buildd-97 into lp:launchpad-buildd

[LaMont Jones]

bzr-builder is not compatible with happiness in places where it isn't wanted. We'll handle installing it on the ppa builders as part of the auto install.

[Jelmer Vernooij (jelmer)]

Happiness isn't wanted in some places?

Handling bzr-builder in the builders as part of the auto install doesn't seem unreasonable, but I'm curious how bzr-builder is breaking things.

review: Approve

[LaMont Jones (lamont)]

we lacked bzr-builder for maverick and natty (arm boxes). and likewise, we don't want to be testing bzr-builder on a large number of releases where we won't actually be running it.

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-11 12:19:38 +0000
+++ debian/changelog	2011-11-15 10:36:26 +0000
@@ -1,3 +1,16 @@
+launchpad-buildd (97) hardy-cat; urgency=low
+
+  * drop bzr-builder dependency entirely and handle it in the autoinstall
+    process on x86 virtual builders
+
+ -- LaMont Jones <[e-mail]>  Tue, 15 Nov 2011 03:15:23 -0700
+
+launchpad-buildd (96) hardy-cat; urgency=low
+
+  * only depend on bzr-builder on i386.
+
+ -- LaMont Jones <[e-mail]>  Tue, 15 Nov 2011 02:46:54 -0700
+
 launchpad-buildd (95) hardy; urgency=low
 
   * Add explicit dependency on pristine-tar, recommended by newer

=== modified file 'debian/control'
--- debian/control	2011-11-11 12:19:38 +0000
+++ debian/control	2011-11-15 10:36:26 +0000
@@ -8,7 +8,7 @@
 Package: launchpad-buildd
 Section: misc
 Architecture: all
-Depends: python-lpbuildd, debootstrap, dpkg-dev, linux32, file, bzip2, sudo, ntpdate, adduser, apt-transport-https, lsb-release, apache2, bzr-builder (>= 0.7.1), pristine-tar, ${misc:Depends}
+Depends: python-lpbuildd, debootstrap, dpkg-dev, linux32, file, bzip2, sudo, ntpdate, adduser, apt-transport-https, lsb-release, apache2, pristine-tar, ${misc:Depends}
 Description: Launchpad buildd slave
  This is the launchpad buildd slave package. It contains everything needed to
  get a launchpad buildd going apart from the database manipulation required to