Launchpad itself

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

  1. buildd-trivial
  2. Merge into devel
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merged at revision: 11322
Proposed branch: lp:~jelmer/launchpad/buildd-trivial
Merge into: lp:launchpad
Diff against target: 142 lines (+33/-9)
8 files modified
.bzrignore (+1/-1)
lib/canonical/buildd/debian/changelog (+11/-1)
lib/canonical/buildd/debian/compat (+1/-0)
lib/canonical/buildd/debian/control (+4/-4)
lib/canonical/buildd/debian/launchpad-buildd.examples (+1/-0)
lib/canonical/buildd/debian/launchpad-buildd.init (+10/-0)
lib/canonical/buildd/debian/rules (+4/-3)
lib/canonical/buildd/debian/source/format (+1/-0)
To merge this branch: bzr merge lp:~jelmer/launchpad/buildd-trivial
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) code Abstain
LaMont Jones Pending
Review via email: mp+30808@code.launchpad.net

Description of the change

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).

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

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

review: Abstain (code)
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

<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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2010-07-15 15:57:40 +0000
3+++ .bzrignore 2010-08-12 15:11:04 +0000
4@@ -56,7 +56,6 @@
5 .bazaar
6 .cache
7 .subversion
8-lib/canonical/buildd/launchpad-files
9 .testrepository
10 .memcache.pid
11 ./pipes
12@@ -77,3 +76,4 @@
13 lib/canonical/launchpad-buildd_*_source.build
14 lib/canonical/launchpad-buildd_*_source.changes
15 lib/canonical/buildd/debian/*
16+lib/canonical/buildd/launchpad-files/*
17
18=== renamed file 'daemons/buildd-slave-example.conf' => 'lib/canonical/buildd/buildd-slave-example.conf'
19=== modified file 'lib/canonical/buildd/debian/changelog'
20--- lib/canonical/buildd/debian/changelog 2010-08-05 21:12:36 +0000
21+++ lib/canonical/buildd/debian/changelog 2010-08-12 15:11:04 +0000
22@@ -1,9 +1,19 @@
23 launchpad-buildd (68) UNRELEASED; urgency=low
24
25+ [ William Grant ]
26 * Take an 'arch_tag' argument, so the master can override the slave
27 architecture.
28
29- -- William Grant <wgrant@ubuntu.com> Sun, 01 Aug 2010 22:00:32 +1000
30+ [ Jelmer Vernooij ]
31+
32+ * Explicitly use source format 1.0.
33+ * Add LSB information to init script.
34+ * Use debhelper >= 5 (available in dapper, not yet deprecated in
35+ maverick).
36+ * Fix spelling in description.
37+ * Install example buildd configuration.
38+
39+ -- Jelmer Vernooij <jelmer@canonical.com> Thu, 12 Aug 2010 17:04:14 +0200
40
41 launchpad-buildd (67) hardy-cat; urgency=low
42
43
44=== added file 'lib/canonical/buildd/debian/compat'
45--- lib/canonical/buildd/debian/compat 1970-01-01 00:00:00 +0000
46+++ lib/canonical/buildd/debian/compat 2010-08-12 15:11:04 +0000
47@@ -0,0 +1,1 @@
48+5
49
50=== modified file 'lib/canonical/buildd/debian/control'
51--- lib/canonical/buildd/debian/control 2010-05-19 15:50:27 +0000
52+++ lib/canonical/buildd/debian/control 2010-08-12 15:11:04 +0000
53@@ -3,15 +3,15 @@
54 Priority: extra
55 Maintainer: Adam Conrad <adconrad@ubuntu.com>
56 Standards-Version: 3.5.9
57-Build-Depends-Indep: debhelper (>= 4)
58+Build-Depends-Indep: debhelper (>= 5)
59
60 Package: launchpad-buildd
61 Section: misc
62 Architecture: all
63-Depends: python-twisted-core, python-twisted-web, debootstrap, dpkg-dev, linux32, file, bzip2, sudo, ntpdate, adduser, apt-transport-https, lsb-release, apache2
64+Depends: python-twisted-core, python-twisted-web, debootstrap, dpkg-dev, linux32, file, bzip2, sudo, ntpdate, adduser, apt-transport-https, lsb-release, apache2, ${misc:Depends}
65 Description: Launchpad buildd slave
66 This is the launchpad buildd slave package. It contains everything needed to
67 get a launchpad buildd going apart from the database manipulation required to
68 tell launchpad about the slave instance. If you are creating more than one
69- slave instance on the same computer, be sure to give them independant configs
70- and independant filecaches etc.
71+ slave instance on the same computer, be sure to give them independent configs
72+ and independent filecaches etc.
73
74=== added file 'lib/canonical/buildd/debian/launchpad-buildd.examples'
75--- lib/canonical/buildd/debian/launchpad-buildd.examples 1970-01-01 00:00:00 +0000
76+++ lib/canonical/buildd/debian/launchpad-buildd.examples 2010-08-12 15:11:04 +0000
77@@ -0,0 +1,1 @@
78+buildd-slave-example.conf
79
80=== modified file 'lib/canonical/buildd/debian/launchpad-buildd.init'
81--- lib/canonical/buildd/debian/launchpad-buildd.init 2010-03-31 17:10:21 +0000
82+++ lib/canonical/buildd/debian/launchpad-buildd.init 2010-08-12 15:11:04 +0000
83@@ -8,6 +8,16 @@
84 #
85 # Author: Daniel Silverstone <daniel.silverstone@canonical.com>
86
87+### BEGIN INIT INFO
88+# Provides: launchpad_buildd
89+# Required-Start: $local_fs $network $syslog $time
90+# Required-Stop: $local_fs $network $syslog $time
91+# Default-Start: 2 3 4 5
92+# Default-Stop: 0 1 6
93+# X-Interactive: false
94+# Short-Description: Start/stop launchpad buildds
95+### END INIT INFO
96+
97 set -e
98
99 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
100
101=== modified file 'lib/canonical/buildd/debian/rules'
102--- lib/canonical/buildd/debian/rules 2010-07-18 08:49:02 +0000
103+++ lib/canonical/buildd/debian/rules 2010-08-12 15:11:04 +0000
104@@ -3,7 +3,6 @@
105 # Copyright 2009, 2010 Canonical Ltd. This software is licensed under the
106 # GNU Affero General Public License version 3 (see the file LICENSE).
107
108-export DH_COMPAT=4
109 export DH_OPTIONS
110
111 # This is an incomplete debian rules file for making the launchpad-buildd deb
112@@ -41,6 +40,7 @@
113 etc/launchpad-buildd \
114 usr/share/launchpad-buildd/canonical/launchpad/daemons \
115 usr/share/doc/launchpad-buildd
116+ dh_installexamples
117
118 # Do installs here
119 touch $(pytarget)/../launchpad/__init__.py
120@@ -89,10 +89,11 @@
121 clean:
122 dh_clean
123
124-package:
125- mkdir -p launchpad-files
126+prepare:
127 install -m644 $(daemons)/buildd-slave.tac launchpad-files/buildd-slave.tac
128 cp ../launchpad/daemons/tachandler.py launchpad-files/tachandler.py
129+
130+package: prepare
131 debuild -uc -us -S
132
133 build:
134
135=== added directory 'lib/canonical/buildd/debian/source'
136=== added file 'lib/canonical/buildd/debian/source/format'
137--- lib/canonical/buildd/debian/source/format 1970-01-01 00:00:00 +0000
138+++ lib/canonical/buildd/debian/source/format 2010-08-12 15:11:04 +0000
139@@ -0,0 +1,1 @@
140+1.0
141
142=== added directory 'lib/canonical/buildd/launchpad-files'