Merge lp:~jelmer/launchpad/buildd-trivial into lp:launchpad

[Jelmer Vernooij]

Collection of trivial fixes for launchpad-buildd.

Some fixes for low-hanging fruit; warnings from lintian.

Add 'prepare' rule for debian/rules which copies the right files in but doesn't build a source package (making it easier to use other build tools instead).

[Jelmer Vernooij (jelmer)]

Waiting for LaMont to review rather than one of the Launchpad reviewers.

review: Abstain (code)

[Jelmer Vernooij (jelmer)]

<lamont> jelmer: why break package into prepare and package?
<lamont> jelmer: other than that question, +1 from me
<lamont> jelmer: and actually, we should bzr ignore all of launchpad-files, not just tachandler.py
<jelmer> lamont: Since I install launchpad-buildd locally I'd like to build a binary package, not a source package. Splitting out prepare allows me to run prepare just once and then modify / debuild as necessary.
<jelmer> lamont: I'll update bzrignore to just ignore all files in launchpad-files.
<lamont> ah, ok
...
<jelmer> lamont: diff is here: http://pastebin.ubuntu.com/476947/
<lamont> jelmer: +1

=== modified file '.bzrignore'
--- .bzrignore	2010-07-15 15:57:40 +0000
+++ .bzrignore	2010-08-12 15:11:04 +0000
@@ -56,7 +56,6 @@
 .bazaar
 .cache
 .subversion
-lib/canonical/buildd/launchpad-files
 .testrepository
 .memcache.pid
 ./pipes
@@ -77,3 +76,4 @@
 lib/canonical/launchpad-buildd_*_source.build
 lib/canonical/launchpad-buildd_*_source.changes
 lib/canonical/buildd/debian/*
+lib/canonical/buildd/launchpad-files/*

=== renamed file 'daemons/buildd-slave-example.conf' => 'lib/canonical/buildd/buildd-slave-example.conf'
=== modified file 'lib/canonical/buildd/debian/changelog'
--- lib/canonical/buildd/debian/changelog	2010-08-05 21:12:36 +0000
+++ lib/canonical/buildd/debian/changelog	2010-08-12 15:11:04 +0000
@@ -1,9 +1,19 @@
 launchpad-buildd (68) UNRELEASED; urgency=low
 
+  [ William Grant ]
   * Take an 'arch_tag' argument, so the master can override the slave
     architecture.
 
- -- William Grant <[e-mail]>  Sun, 01 Aug 2010 22:00:32 +1000
+  [ Jelmer Vernooij ]
+
+  * Explicitly use source format 1.0.
+  * Add LSB information to init script.
+  * Use debhelper >= 5 (available in dapper, not yet deprecated in
+    maverick).
+  * Fix spelling in description.
+  * Install example buildd configuration.
+
+ -- Jelmer Vernooij <[e-mail]>  Thu, 12 Aug 2010 17:04:14 +0200
 
 launchpad-buildd (67) hardy-cat; urgency=low
 

=== added file 'lib/canonical/buildd/debian/compat'
--- lib/canonical/buildd/debian/compat	1970-01-01 00:00:00 +0000
+++ lib/canonical/buildd/debian/compat	2010-08-12 15:11:04 +0000
@@ -0,0 +1,1 @@
+5

=== modified file 'lib/canonical/buildd/debian/control'
--- lib/canonical/buildd/debian/control	2010-05-19 15:50:27 +0000
+++ lib/canonical/buildd/debian/control	2010-08-12 15:11:04 +0000
@@ -3,15 +3,15 @@
 Priority: extra
 Maintainer: Adam Conrad <[e-mail]>
 Standards-Version: 3.5.9
-Build-Depends-Indep: debhelper (>= 4)
+Build-Depends-Indep: debhelper (>= 5)
 
 Package: launchpad-buildd
 Section: misc
 Architecture: all
-Depends: python-twisted-core, python-twisted-web, debootstrap, dpkg-dev, linux32, file, bzip2, sudo, ntpdate, adduser, apt-transport-https, lsb-release, apache2
+Depends: python-twisted-core, python-twisted-web, debootstrap, dpkg-dev, linux32, file, bzip2, sudo, ntpdate, adduser, apt-transport-https, lsb-release, apache2, ${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
  tell launchpad about the slave instance. If you are creating more than one
- slave instance on the same computer, be sure to give them independant configs
- and independant filecaches etc.
+ slave instance on the same computer, be sure to give them independent configs
+ and independent filecaches etc.

=== added file 'lib/canonical/buildd/debian/launchpad-buildd.examples'
--- lib/canonical/buildd/debian/launchpad-buildd.examples	1970-01-01 00:00:00 +0000
+++ lib/canonical/buildd/debian/launchpad-buildd.examples	2010-08-12 15:11:04 +0000
@@ -0,0 +1,1 @@
+buildd-slave-example.conf

=== modified file 'lib/canonical/buildd/debian/launchpad-buildd.init'
--- lib/canonical/buildd/debian/launchpad-buildd.init	2010-03-31 17:10:21 +0000
+++ lib/canonical/buildd/debian/launchpad-buildd.init	2010-08-12 15:11:04 +0000
@@ -8,6 +8,16 @@
 #
 # Author:       Daniel Silverstone <[e-mail]>
 
+### BEGIN INIT INFO
+# Provides:          launchpad_buildd
+# Required-Start:    $local_fs $network $syslog $time
+# Required-Stop:     $local_fs $network $syslog $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# X-Interactive:     false
+# Short-Description: Start/stop launchpad buildds
+### END INIT INFO
+
 set -e
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin

=== modified file 'lib/canonical/buildd/debian/rules'
--- lib/canonical/buildd/debian/rules	2010-07-18 08:49:02 +0000
+++ lib/canonical/buildd/debian/rules	2010-08-12 15:11:04 +0000
@@ -3,7 +3,6 @@
 # Copyright 2009, 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-export DH_COMPAT=4
 export DH_OPTIONS
 
 # This is an incomplete debian rules file for making the launchpad-buildd deb
@@ -41,6 +40,7 @@
 	  etc/launchpad-buildd \
 	  usr/share/launchpad-buildd/canonical/launchpad/daemons \
 	  usr/share/doc/launchpad-buildd
+	dh_installexamples
 
 	# Do installs here
 	touch $(pytarget)/../launchpad/__init__.py
@@ -89,10 +89,11 @@
 clean:
 	dh_clean
 
-package:
-	mkdir -p launchpad-files
+prepare:
 	install -m644 $(daemons)/buildd-slave.tac launchpad-files/buildd-slave.tac
 	cp ../launchpad/daemons/tachandler.py launchpad-files/tachandler.py
+
+package: prepare
 	debuild -uc -us -S
 
 build:

=== added directory 'lib/canonical/buildd/debian/source'
=== added file 'lib/canonical/buildd/debian/source/format'
--- lib/canonical/buildd/debian/source/format	1970-01-01 00:00:00 +0000
+++ lib/canonical/buildd/debian/source/format	2010-08-12 15:11:04 +0000
@@ -0,0 +1,1 @@
+1.0

=== added directory 'lib/canonical/buildd/launchpad-files'