Jelmer Vernooij has proposed merging lp:~jelmer/launchpad/buildd-trivial into lp:launchpad/devel.
Requested reviews: Launchpad code reviewers (launchpad-reviewers): code 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). Move buildd-slave.tac into the buildd directory. (yet another step towards making it possible to split out launchpad-buildd from the launchpad tree, bug 547036) -- https://code.launchpad.net/~jelmer/launchpad/buildd-trivial/+merge/30808 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/launchpad/buildd-trivial into lp:launchpad/devel.
=== modified file '.bzrignore' --- .bzrignore 2010-07-15 15:57:40 +0000 +++ .bzrignore 2010-07-23 17:54:51 +0000 @@ -77,3 +77,4 @@ lib/canonical/launchpad-buildd_*_source.build lib/canonical/launchpad-buildd_*_source.changes lib/canonical/buildd/debian/* +lib/canonical/buildd/launchpad-files/tachandler.py === 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-07-19 18:14:54 +0000 +++ lib/canonical/buildd/debian/changelog 2010-07-23 17:54:51 +0000 @@ -1,3 +1,14 @@ +launchpad-buildd (67) hardy-cat; urgency=low + + * 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 <[email protected]> Thu, 22 Jul 2010 19:40:31 +0200 + launchpad-buildd (66) hardy-cat; urgency=low * handle [linux-any] build-dependencies. LP#604981 === 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-07-23 17:54:51 +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-07-23 17:54:51 +0000 @@ -3,15 +3,15 @@ Priority: extra Maintainer: Adam Conrad <[email protected]> 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-07-23 17:54:51 +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-07-23 17:54:51 +0000 @@ -8,6 +8,16 @@ # # Author: Daniel Silverstone <[email protected]> +### 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-07-23 17:54:51 +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,10 @@ clean: dh_clean -package: - mkdir -p launchpad-files - install -m644 $(daemons)/buildd-slave.tac launchpad-files/buildd-slave.tac +prepare: 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-07-23 17:54:51 +0000 @@ -0,0 +1,1 @@ +1.0 === added directory 'lib/canonical/buildd/launchpad-files' === renamed file 'daemons/buildd-slave.tac' => 'lib/canonical/buildd/launchpad-files/buildd-slave.tac'
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
