1
commit e925e754f84653f4a9291982431eb53ca9166f81
2
Author: Roger Leigh <rleigh@debian.org>
3
Date: Sun May 17 21:45:09 2009 +0100
5
[debian] changelog: Update for 0.58.3
7
commit 1a27c42ceded9689131f3c59769f6231a6e0d13d
8
Author: Roger Leigh <rleigh@debian.org>
9
Date: Sun May 17 21:35:04 2009 +0100
11
[TODO] Remove completed items
13
commit 519b376baa2d52acd15129ac57c7147a10fba0eb
14
Author: Roger Leigh <rleigh@debian.org>
15
Date: Sun May 17 21:13:58 2009 +0100
17
[build] Don't generate man/sbuild-upgrade.1
19
commit bb874ad9f6a561d5276a62546e0f82e537fc8d5b
20
Author: Roger Leigh <rleigh@debian.org>
21
Date: Sun May 17 21:13:01 2009 +0100
23
[TODO] Add missing features for ChrootSetup to handle
25
commit 182a64fb01ebc8f8de9c63cfe79892f5c47284ff
26
Author: Roger Leigh <rleigh@debian.org>
27
Date: Sun May 17 21:12:29 2009 +0100
29
[Sbuild::ChrootSetup] Default priority to avoid unnecessary messages
31
commit f3e8b060469ba0451c709ceaf1124317e81d613a
32
Author: Roger Leigh <rleigh@debian.org>
33
Date: Sun May 17 21:11:46 2009 +0100
35
[sbuild-stats] Include modules in correct order
37
commit a820bc90a65d2be6e9792ae759f62cc6e8f27af3
38
Author: Roger Leigh <rleigh@debian.org>
39
Date: Sun May 17 21:10:18 2009 +0100
41
[bin] sbuild-(update|upgrade): Use Sbuild::ChrootSetup
43
Also add sbuild-distupgrade to run apt-get dist-upgrade
45
Merge manual pages for all three commands.
47
commit 688b82958a878991394fb2003f3fedd266d7201e
48
Author: Roger Leigh <rleigh@debian.org>
49
Date: Sun May 17 21:06:15 2009 +0100
51
[Sbuild::Utility] Don't pass session to open_log
53
commit 532bbda92f3edc3d5d986d9bbebba30ef2cec927
54
Author: Roger Leigh <rleigh@debian.org>
55
Date: Sun May 17 19:24:34 2009 +0100
57
[Sbuild::Build] Pass configuration to ChrootSetup functions
59
commit 75d097f665d998ef152655a3530d739c94014a08
60
Author: Roger Leigh <rleigh@debian.org>
61
Date: Sun May 17 19:23:57 2009 +0100
63
[debian] sbuild.install: Don't install 50sbuild
65
commit d5c149db7275e371d81571c453e9c643baa7324f
66
Author: Roger Leigh <rleigh@debian.org>
67
Date: Sun May 17 19:23:21 2009 +0100
69
[debian] sbuild.postinst: Update sbuild group ownership recursively
71
commit 49cff2a04ddb15f846195f5743c7325b9dbb9437
72
Author: Roger Leigh <rleigh@debian.org>
73
Date: Sun May 17 19:22:54 2009 +0100
75
[debian] NEWS: Document sbuild system group transition
77
commit 522bd057f6b002b43cb02c68c46c0ab526ebd63f
78
Author: Roger Leigh <rleigh@debian.org>
79
Date: Sun May 17 18:03:58 2009 +0100
81
[debian] Add libsbuild-perl.install
85
commit 751d0c8b7dfef6d8e943a24c9e153b7b64f72017
86
Author: Roger Leigh <rleigh@debian.org>
87
Date: Sun May 17 18:02:10 2009 +0100
89
[Buildd/*] Update copyrights
91
commit b8ebb98c37c50c3a37aec835f6b5bee016c9d9be
92
Author: Roger Leigh <rleigh@debian.org>
93
Date: Sun May 17 17:52:21 2009 +0100
95
[buildd-watcher] Remove main namespace
97
commit 762b0da70fa481797482506e1d1fbe8f714cff5a
98
Author: Roger Leigh <rleigh@debian.org>
99
Date: Sun May 17 17:52:01 2009 +0100
101
[buildd-uploader|watcher] Update copyright
103
commit a719f63f4877d3905523ff9d7d513015bf11fa7c
104
Author: Roger Leigh <rleigh@debian.org>
105
Date: Sun May 17 17:46:30 2009 +0100
107
[Buildd] Remove write_stats
109
Now present in Buildd::Base
111
commit 8040b79eee0f2168c8b037ccac69736556f526b8
112
Author: Roger Leigh <rleigh@debian.org>
113
Date: Sun May 17 17:44:46 2009 +0100
115
[Sbuild::LogBase] Remove main::LOG
117
Global streams are now not created. main::LOG, main::SAVED_STDOUT
118
and main::SAVED_STDERR are replaced by IO handles exported by the
119
module ($log, $saved_stdout and $saved_stderr).
121
Code previously outputting directly to LOG uses local logging code or
122
the default stream (which is redirected to the log).
124
commit e7ddf00b13bc68c01bec3e45c397631cb9f76498
125
Author: Roger Leigh <rleigh@debian.org>
126
Date: Sun May 17 17:40:22 2009 +0100
128
[Buildd] Remove logger()
130
commit 2ec8b32c3edff687262e4386aa7df5c438117d45
131
Author: Roger Leigh <rleigh@debian.org>
132
Date: Sun May 17 17:34:40 2009 +0100
134
[Buildd::Watcher] Move from buildd-watcher to Buildd/Watcher.pm
136
commit 0f599d5d09b3434662c61a0136f8eadb0261fada
137
Author: Roger Leigh <rleigh@debian.org>
138
Date: Sun May 17 17:33:09 2009 +0100
140
[buildd-watcher] Split into Buildd::Watcher object
142
commit e057fce43732dea62b0fe4d70ac41fffda7246ac
143
Author: Roger Leigh <rleigh@debian.org>
144
Date: Sun May 17 17:29:52 2009 +0100
146
[Buildd::Mail] Move from buildd-mail to Buildd/Mail.pm
148
commit ba7c3076aa126af3a1113f30f432c3ac4e1c96e8
149
Author: Roger Leigh <rleigh@debian.org>
150
Date: Sun May 17 17:28:16 2009 +0100
152
[buildd-mail] Split functionality into Build::Mail object
154
commit d026d64c190718b2e027b0700ec3550fe0e45b51
155
Author: Roger Leigh <rleigh@debian.org>
156
Date: Sun May 17 17:27:59 2009 +0100
158
[Buildd::Base] Include open_log and close_log
160
commit 5b011e818a5a29fe023966e35c9af4fdb8b9c80d
161
Author: Roger Leigh <rleigh@debian.org>
162
Date: Sun May 17 17:17:56 2009 +0100
164
[Buildd::Uploader] Move from buildd-uploader to Buildd/Uploader.pm
166
commit 69fa11e6fbabdf3f6aa94d3ae60f9e63379c8f40
167
Author: Roger Leigh <rleigh@debian.org>
168
Date: Sun May 17 17:15:45 2009 +0100
170
[buildd-uploader] Move logic into Buildd::Uploader
172
commit 7ead14eaeca6207c6f2607953aa141cc3db4f042
173
Author: Roger Leigh <rleigh@debian.org>
174
Date: Sun May 17 17:15:15 2009 +0100
176
[Buildd::Daemon] Remove redundant function prototypes
178
commit 40d6cf166e6f27933e514ded3ec8d429c468bbe1
179
Author: Roger Leigh <rleigh@debian.org>
180
Date: Sun May 17 17:05:31 2009 +0100
182
[Buildd::Daemon] Move from buildd to Buildd/Daemon.pm
184
commit beca78d3dcb5f89601414d79da0c209f617656d2
185
Author: Roger Leigh <rleigh@debian.org>
186
Date: Sun May 17 17:03:05 2009 +0100
188
[buildd] Split into object Buildd::Daemon
190
commit 9df6c9ec196a0940b9c84e2001749ce89d90ac5e
191
Author: Roger Leigh <rleigh@debian.org>
192
Date: Sun May 17 16:57:53 2009 +0100
194
[Buildd::Base] Base functionality for buildd programs
196
commit cfbdaecd7605a567abfc3edc2d4f637c9a506b7a
197
Author: Roger Leigh <rleigh@debian.org>
198
Date: Sun May 17 16:19:28 2009 +0100
200
[TODO] Use ChrootSetup for sbuild-* commands
202
commit 6b6b39a788bf299e7e312c45e386293180383f8b
203
Author: Roger Leigh <rleigh@debian.org>
204
Date: Sun May 17 16:15:25 2009 +0100
206
[WannaBuild::Mail] Split new module from wanna-build-mail
208
commit e3c61bac12e9e86ccf8b2f1de7a6bd650c10ba0a
209
Author: Roger Leigh <rleigh@debian.org>
210
Date: Sun May 17 16:01:32 2009 +0100
212
[wanna-build-mail] Convert into object
214
commit c000d93b451139ebaffdcb9d216c197225045541
215
Author: Roger Leigh <rleigh@debian.org>
216
Date: Sun May 17 16:00:23 2009 +0100
218
[wanna-build] Set $| at top level
220
commit f281c973e21ab03b91fd54889e80e3a22a796f41
221
Author: Roger Leigh <rleigh@debian.org>
222
Date: Sun May 17 15:58:35 2009 +0100
224
[Sbuild::ChrootSetup] Add comment about root requirement
226
commit 4c614cc8c38e928fb0ad1469289b5bfda67e3cc3
227
Author: Roger Leigh <rleigh@debian.org>
228
Date: Sun May 17 15:56:06 2009 +0100
230
[debian] Handle migration of sbuild group to a system group
232
Also remove 50sbuild setup script, which is responsible for
233
setting sbuild group ownership in the chroot. This is now handled
236
commit e0b9953668fab0c34c4b427ea878c3acd6de68b1
237
Author: Roger Leigh <rleigh@debian.org>
238
Date: Sun May 17 15:47:18 2009 +0100
240
[Sbuild::ChrootSetup] Fix permissions on /build in chroot
242
commit 1eac3bb417af16049102bd102d7e42dd33ef27eb
243
Author: Roger Leigh <rleigh@debian.org>
244
Date: Sun May 17 15:02:42 2009 +0100
246
[debian] sbuild.postinst|postrm: Use addgroup|delgroup --system
248
Previously, a system sbuild group was not created.
250
commit eaee2c13510f25c5dcd725b29ffdd6fe348c7541
251
Author: Roger Leigh <rleigh@debian.org>
252
Date: Sun May 17 14:58:20 2009 +0100
254
[Sbuild::Buildd] open_log: Simplify message formatting
256
commit 8d3445e46ba4acb308e2a87107e4ca22daf6988d
257
Author: Roger Leigh <rleigh@debian.org>
258
Date: Sun May 17 14:57:51 2009 +0100
260
[TODO] Add option to disable package removal
262
commit 84e9f32f302982a631151350bca3a9665fdb8d20
263
Author: Roger Leigh <rleigh@debian.org>
264
Date: Sun May 17 14:56:49 2009 +0100
266
[sbuild-createchroot] Use Sbuild::ChrootSetup during setup
268
commit ef316bf1e6fbca3f3432f3b65cc192a4e8b6424c
269
Author: Roger Leigh <rleigh@debian.org>
270
Date: Sun May 17 14:55:16 2009 +0100
272
[sbuild-createchroot] Add --setup-only option to skip debootstrap
274
commit 40eb8e27943878cd3bd4a10cb862819eb3dae651
275
Author: Roger Leigh <rleigh@debian.org>
276
Date: Sun May 17 14:53:45 2009 +0100
278
[Sbuild::Build] Use ChrootSetup for updating chroots
280
commit ee71513411468c9363369f08ee17a8dfe8c7e5a8
281
Author: Roger Leigh <rleigh@debian.org>
282
Date: Sun May 17 14:50:56 2009 +0100
284
[Sbuild::Chroot] Use Sbuild::ChrootSetup
286
ChrootSetup::basesetup is used to set up the chroot.
288
Also add additional diagnostics and error handling to _setup_options
290
commit 0fd597b9829f18577daf338511ad06fbff3afb2f
291
Author: Roger Leigh <rleigh@debian.org>
292
Date: Sun May 17 14:49:39 2009 +0100
294
[Sbuild::ChrootSetup] Add new module containing common chroot setup tasks
296
commit 9a2c1985c5a8f1343ad7bab9325e15ad1bc031ca
297
Author: Roger Leigh <rleigh@debian.org>
298
Date: Sun May 17 14:46:06 2009 +0100
300
[Sbuild::Chroot*] Return an error if _setup_options fails
302
This was likely the cause of sbuild-createchroot running apt-get
303
on the host system, since _setup_options bailed out prior to
304
setting up the environment for split apt usage.
306
commit be9ab94c7dfa5a74b7a8b3651df904e4444b11f5
307
Merge: ee19517 fae3496
308
Author: Roger Leigh <rleigh@debian.org>
309
Date: Sun May 17 12:16:01 2009 +0100
311
Merge branch 'master' of ssh+git://git.debian.org/git/buildd-tools/sbuild
313
commit fae34962a3016ac0585fd98b981096f493f1daf6
314
Author: Roger Leigh <rleigh@debian.org>
315
Date: Sun May 17 12:09:15 2009 +0100
317
[buildd-mail] Remove lockfile use for log stream locking
319
commit 96d6e03977c8ea572e36c7d10414b5f92c87a04c
320
Author: Roger Leigh <rleigh@debian.org>
321
Date: Sun May 17 12:00:42 2009 +0100
323
[Sbuild::Build] Logger ignores fatal signals
325
commit 686fcc039bee161c3e888afadf8c27bb67d20479
326
Author: Roger Leigh <rleigh@debian.org>
327
Date: Sun May 17 11:58:11 2009 +0100
329
[TODO] Plan logger removal
331
commit 89b32ae9fa688aec3bdba6f8e4ceeb6b993e04bf
332
Author: Roger Leigh <rleigh@debian.org>
333
Date: Sun May 17 11:56:29 2009 +0100
335
[buildd-watcher] Remove use of $main::HOME
337
commit 2c4f6ef873eff2e9b75a6a4593929a9dd7e67cef
338
Author: Roger Leigh <rleigh@debian.org>
339
Date: Sun May 17 11:54:38 2009 +0100
341
[buildd-uploader] Remove lockfile use for log stream locking
343
The locking was fundamentally broken, and it's not needed due to
344
using O_APPEND in any case.
346
commit 60a78d36dc93c6f5bcb49525654031742704b919
347
Author: Roger Leigh <rleigh@debian.org>
348
Date: Sun May 17 01:17:53 2009 +0100
350
[TODO] Update pending buildd tasks
352
commit e48de595821d84e9b15299164b43839c4a9d2c6a
353
Author: Roger Leigh <rleigh@debian.org>
354
Date: Sun May 17 01:16:07 2009 +0100
356
[Buildd::Uploader] Use Sbuild::ChrootRoot to run wanna-build
358
commit 0faabb8c54f9a94eaa93716740f39f1937fbe40f
359
Author: Roger Leigh <rleigh@debian.org>
360
Date: Sun May 17 01:06:55 2009 +0100
362
[TODO] Fix buildd-mail statistics reporting
364
commit 6094e1a56f031f6f5b1603c892e080072574b880
365
Author: Roger Leigh <rleigh@debian.org>
366
Date: Sun May 17 01:06:05 2009 +0100
370
commit 49d51dc932aaf12b3c31074023a7618c3639f8f4
371
Author: Roger Leigh <rleigh@debian.org>
372
Date: Sun May 17 01:04:01 2009 +0100
374
[Buildd] Logging functions use Sbuild::LogBase
376
commit fd978e40ece184f1e82df05d4a540e41f58f0f91
377
Author: Roger Leigh <rleigh@debian.org>
378
Date: Sun May 17 01:02:57 2009 +0100
380
[Buildd::Conf] Add NO_DETACH options to prevent CTTY detaching for debugging
382
commit c583632b65bd9da4561a042ca7c58fcc2ba5ff2d
383
Author: Roger Leigh <rleigh@debian.org>
384
Date: Sun May 17 00:58:15 2009 +0100
386
[Buildd::Conf] SSH_CMD is an ARGV array
388
To avoid quoting issues, and to use the Sbuild::Chroot command
389
executing, piping and logging infrastructure, execute wanna-build
390
within an Sbuild::ChrootRoot context in buildd and buildd-mail.
392
$sshcmd is no longer specified in the configuration file; separate
393
command, user, hostname, options and socket options are provided and
394
are used to construct the real SSH ARGV for wanna-build executing.
396
Buildd::wannabuild_command is used to construct the final
397
wanna-build command with all SSH setup and socket options.
399
Buildd::Conf only sets array variables if set.
401
Buildd::isin is used without namespace prefix in buildd
403
commit 68a85e04ff3430faad2cea89c3a89ac79d9147e8
404
Author: Roger Leigh <rleigh@debian.org>
405
Date: Sun May 17 00:41:35 2009 +0100
407
[TODO] buildd needs to remove pidfile correctly
409
commit 6a09f3211d2ba6b384bf5715078ab973e35b46bd
410
Author: Roger Leigh <rleigh@debian.org>
411
Date: Sun May 17 00:40:58 2009 +0100
413
[buildd] Only unlink pidfile if we are actually a daemon
415
commit 54c096e7f331ac01e9235d33789fb45060acc0ec
416
Author: Roger Leigh <rleigh@debian.org>
417
Date: Sun May 17 00:36:10 2009 +0100
419
[TODO] Update buildd items
421
commit 2c6f4d19b5a33cfc286f244f6377ffd64437f21e
422
Author: Roger Leigh <rleigh@debian.org>
423
Date: Sun May 17 00:35:31 2009 +0100
425
[buildd] Execute commands using Sbuild::Chroot interface
427
commit 0ad2690c5508ceefedafdaae6b70e9f957d1b82b
428
Author: Roger Leigh <rleigh@debian.org>
429
Date: Sun May 17 00:15:49 2009 +0100
431
[Sbuild::Build] Remove completed TODO comment
433
commit 3a81b73a7f7c2958f5948874a9208b10cebc04bd
434
Author: Roger Leigh <rleigh@debian.org>
435
Date: Sun May 17 00:14:36 2009 +0100
437
[Buildd::Conf] Add BUILD_LOG_FILE to remove hardcoded daemon.log
439
commit 6ba9a2350306929916f5b6849ca13fed48ebe2a9
440
Author: Roger Leigh <rleigh@debian.org>
441
Date: Sun May 17 00:04:00 2009 +0100
443
[buildd] make buildd pidfile configurable, rather than hardcoded.
445
Also simplify signal handling with shutdown_fast replacing lamba function.
447
commit 81ac71bb41e451d396121b2f86f584e355a478a9
448
Author: Roger Leigh <rleigh@debian.org>
449
Date: Tue May 12 21:11:57 2009 +0100
451
[Sbuild::Conf] Rename $setup_hook to $chroot_setup_script
453
commit 773d1a8e2c45bb138e3c0ae4d4655c37e7716c02
454
Author: Roger Leigh <rleigh@debian.org>
455
Date: Tue May 12 20:00:27 2009 +0100
457
[man] Document --setup-hook
459
Also add to example configuration.
461
commit 6cd6ff09bd1aaeb6a504bf8281664e20ddd1fdcc
462
Author: Kees Cook <kees.cook@canonical.com>
463
Date: Tue May 12 19:53:54 2009 +0100
465
[Sbuild] Add --setup-hook to run in chroot before build
467
This adds the --setup-hook command line argument that allows a
468
program to be run from inside the chroot just before the build
469
started. All the scalar build and config settings are exported
470
to the environment so the script can examine them to take any
473
Signed-off-by: Roger Leigh <rleigh@debian.org>
475
commit ee195178b218e216e6807a3797eef986fb6699a8
476
Author: Roger Leigh <rleigh@debian.org>
477
Date: Sun May 3 00:13:30 2009 +0100
479
[build] configure.ac: Add WANNA_BUILD_SYSCONF_DIR
481
commit 65334f06cdf6f633a7ed86659120b20d6fe96f5b
482
Author: Roger Leigh <rleigh@debian.org>
483
Date: Sat May 2 19:21:24 2009 +0100
485
[NEWS] Document DEBEMAIL change
487
commit 0b64ae5a0900ac943f54a4cda50d4fa2c45da7dc
488
Author: Roger Leigh <rleigh@debian.org>
489
Date: Sat May 2 19:16:07 2009 +0100
491
[*::Conf] Use eval in place of require
493
Using require means that %INC has to be messed around with in order to
494
read the same configuration file more than once. It also means that by
495
default any invalid variables in the configuration file are not
498
Also move wanna-build configuration back to wanna-build.conf, but using
501
commit 5887ce8efd86e39345ff8914302634382563b609
502
Author: Roger Leigh <rleigh@debian.org>
503
Date: Sat May 2 19:08:55 2009 +0100
505
[build] Distribute Wannabuild::Database
507
commit d512f3150113fa61da5c091b2b0aa27dcb1661d7
508
Author: Roger Leigh <rleigh@debian.org>
509
Date: Wed Apr 29 23:42:06 2009 +0100
511
[Sbuild::Conf] Remove SRCDEP_LOCK_DIR check
513
This is not needed on the host. It's already created by the
514
50sbuild setup script and sbuild-createchroot.
516
commit eec387f67daf5dbba1e5aa7d5ea139ba7c66ffb6
517
Author: Roger Leigh <rleigh@debian.org>
518
Date: Thu Apr 30 22:16:06 2009 +0100
520
[Sbuild::Build] Fix incorrect debug statement
522
commit a377cccdb7bfe738c2dee5ea4196e40edd243e40
523
Author: Roger Leigh <rleigh@debian.org>
524
Date: Thu Apr 30 20:59:03 2009 +0100
526
[.gitignore] Ignore generated db.sql
528
commit b11230c6d41c39110371a87eb60f1c3048008230
529
Author: Roger Leigh <rleigh@debian.org>
530
Date: Wed Apr 29 23:41:30 2009 +0100
532
[Sbuild::Build] Quote newlines with double quotes
534
commit 7c031ba8dec7e7473da35c0a822463337e056290
535
Author: Roger Leigh <rleigh@debian.org>
536
Date: Wed Apr 29 23:40:28 2009 +0100
538
[Sbuild::LogBase] Reopen streams in reverse order to avoid deadlocking
540
Blocking of fatal signals is needed to prevent the parent of the logger
541
getting a SIGPIPE, and to prevent loss of final log messages.
543
commit 7e0c64243c6fdb2fb1816402fbe6e05b5019190c
544
Author: Roger Leigh <rleigh@debian.org>
545
Date: Wed Apr 29 23:02:06 2009 +0100
547
[Sbuild::LogBase] Don't close STDOUT or STDERR
549
When reopening, we can't guarantee getting the same fd (1 or 2).
550
Therefore just reopen in place.
552
Redirect whether or not in verbose mode (since we might want to log
553
what's printed to STDOUT or STDERR, and the real original fds are
554
still open in the logger coprocess; output to STDOUT or STDERR in the
555
parent will therefore be redirected to the logger and logged both to
556
file and/or standard output depending upon the configuration.
558
commit fa3da651871b6184518f8140c267a871838c044c
559
Author: Roger Leigh <rleigh@debian.org>
560
Date: Sun Apr 26 18:20:02 2009 +0100
562
[Sbuild::LogBase] Log to file if NOLOG is not set
564
commit 9e2c7e13893695f259cbfd3592ca22193c1eaf7e
565
Author: Roger Leigh <rleigh@debian.org>
566
Date: Sat May 2 15:59:56 2009 +0100
568
[debian] Close #520158
570
commit 5010c78fb4d3306e724aece968add8435e3b0787
571
Author: Roger Leigh <rleigh@debian.org>
572
Date: Tue Mar 17 21:18:16 2009 +0000
574
[Sbuild::Conf] Don't default MAINTAINER_NAME
576
Set to $DEBEMAIL only if no maintainer, uploader or key-id have
579
commit ce20dbc27bb76609a4d461c2cfcf7287a9b69177
580
Author: Roger Leigh <rleigh@debian.org>
581
Date: Sat May 2 15:39:15 2009 +0100
583
[debian] Split common library functions into libsbuild-perl package
585
commit cbbbee0eb5ddec8635123984d339dfe8aef9f7ab
586
Author: Roger Leigh <rleigh@debian.org>
587
Date: Thu Apr 30 20:56:49 2009 +0100
589
[debian] Add buildd mail forwarding to buildd-mail
591
commit bc4b34fcfbd5d4504b21e53a805c9431603d4c63
592
Author: Roger Leigh <rleigh@debian.org>
593
Date: Thu Apr 30 20:57:41 2009 +0100
595
[man] Add buildd-vlog manual page
597
commit f5b5db5b4bd01d05c59b04722058a1b9dba16e1f
598
Author: Roger Leigh <rleigh@debian.org>
599
Date: Sat May 2 14:51:22 2009 +0100
601
[TODO] Add wanna-build work
603
commit 99a0d5b4d932bc65f64682eb270e356c8f5ce1c3
604
Author: Roger Leigh <rleigh@debian.org>
605
Date: Sat May 2 14:49:42 2009 +0100
607
[Wannabuild::Database] New module split from wanna-build
609
commit bae1d22aab859c20aca301e87b4943dc21b8d8c2
610
Author: Roger Leigh <rleigh@debian.org>
611
Date: Sat May 2 14:47:30 2009 +0100
613
[wanna-build] Move invocation under alternative names to top level
615
commit 2ad351b786095c54faa65628e66340b034622322
616
Author: Roger Leigh <rleigh@debian.org>
617
Date: Sat May 2 14:46:55 2009 +0100
619
[wanna-build] Close databases on program termination
621
commit a2ff64e83be10bd1858690f86ae2a93917ff98bc
622
Author: Roger Leigh <rleigh@debian.org>
623
Date: Sat May 2 14:40:14 2009 +0100
625
[wanna-build] database variables are class member data
627
'Current Database' replaces $db
628
'Databases' replaces %databases
630
commit 2702c23fc1ca0275585bc541c0831d3f12df17a1
631
Author: Roger Leigh <rleigh@debian.org>
632
Date: Sat May 2 14:33:41 2009 +0100
634
[wanna-build] value hash variables are class member data
636
'Priority Values' replaces %prioval
637
'Section Values' replaces %sectval
638
'Category Values' replaces %catval
640
These may be later specified in the configuration file.
642
commit 8cead28c95afa2545114a35e984daf47a5b3c46d
643
Author: Roger Leigh <rleigh@debian.org>
644
Date: Sat May 2 14:22:32 2009 +0100
646
[wanna-build] 'Merge Bin Src' member replaces %merge_binsrc
648
commit e9786b291bccabeede68bd4c1698f640ce3fa352
649
Author: Roger Leigh <rleigh@debian.org>
650
Date: Sat May 2 14:21:08 2009 +0100
652
[wanna-build] 'Merge Src Version' member replaces %merge_srcvers
654
commit 2ff05cc3461e02238b088462db72957e63739e9b
655
Author: Roger Leigh <rleigh@debian.org>
656
Date: Sat May 2 14:19:13 2009 +0100
658
[wanna-build] 'New Version' member replaces %new_vers
660
commit eb86cb89ab7941587c55685a10fe9f61e3eeeb9f
661
Author: Roger Leigh <rleigh@debian.org>
662
Date: Sat May 2 13:58:53 2009 +0100
664
[wanna-build] Date and time variables are class member data
666
'Current Date' is $curr_date
667
'Short Date' is $short_date
668
'Current Time' is $ctime
670
commit 70f17b63d6979a3ab94fa1b749c1e4fb7c775c19
671
Author: Roger Leigh <rleigh@debian.org>
672
Date: Sat May 2 13:50:05 2009 +0100
674
[wanna-build] 'Mail Logs' member replaces $mail_logs
676
commit 2a5f9c6a187c7b770fb684527bc328ae12a77b43
677
Author: Roger Leigh <rleigh@debian.org>
678
Date: Sat May 2 13:45:31 2009 +0100
680
[wanna-build] Convert to object Wannabuild::Database
682
commit 1bfb0f16ec76d5213c04fa35aa064ca7d6aa9c51
683
Author: Roger Leigh <rleigh@debian.org>
684
Date: Fri May 1 19:33:03 2009 +0100
686
[Sbuild::Chroot] run_command_internal: Don't create pipe
688
This avoid incorrect interleaving of stdout and stderr due to
691
commit f0c94b435e0b3a3b58ccc099cf0f6ef053993a88
692
Author: Roger Leigh <rleigh@debian.org>
693
Date: Fri May 1 18:15:35 2009 +0100
695
[Sbuild::Build] Correctly create log symlinks
697
Remove check for log existence, by creating in the logger
698
coprocess after opening the log.
700
commit 1e5164c1f6d27248993e352ddcc3a494a5712f53
701
Author: Roger Leigh <rleigh@debian.org>
702
Date: Sun Apr 26 22:38:35 2009 +0100
704
[Buildd::Conf] Only be verbose if not detaching from TTY
706
Previously defaulted to verbose mode if initially attached to a
707
terminal before becoming a daemon.
709
commit e541f3967487dab8b00901f407bd22a3311f8a7b
710
Author: Roger Leigh <rleigh@debian.org>
711
Date: Sun Apr 26 22:15:25 2009 +0100
713
[Sbuild::LogBase] Default logging function only outputs to single file
715
commit 2b47351847eb6fede491b5d2b959af2fe2b9cedd
716
Author: Roger Leigh <rleigh@debian.org>
717
Date: Sun Apr 26 20:44:06 2009 +0100
719
[Buildd::Conf] Default mail addresses to root
721
This is not useful for a real buildd setup, but will allow the
722
package to function until properly configured.
724
commit 0e1ec956b7938c9a70cb348fa4ede03ddef76305
725
Author: Roger Leigh <rleigh@debian.org>
726
Date: Sun Apr 26 19:29:52 2009 +0100
728
[shlibdb] Remove last obsolete sourcedeps components
730
Manual source dependencies are no longer supported.
732
commit 97b092fef077e91658977c1406a7a88bcd9c0dae
733
Author: Roger Leigh <rleigh@debian.org>
734
Date: Sun Apr 26 19:23:15 2009 +0100
736
[wanna-build-merge-*] Remove do-merge-* references
738
commit 7b32004591c9f2c73c2d6dbc3dc17adc6fbf3d16
739
Author: Roger Leigh <rleigh@debian.org>
740
Date: Sun Apr 26 19:14:59 2009 +0100
742
[buildd-clean-upload] Remove
744
Obsolete, and replaced by buildd-mail.
746
commit ad4ec26b9ee5facc29d44ca7c17ed6204ad950d3
747
Author: Roger Leigh <rleigh@debian.org>
748
Date: Sun Apr 26 19:10:31 2009 +0100
750
[buildd-clean-upload] Use standard options parsing
752
commit 174e8364e80e8cd6979ef3433de0da3c53cde8bf
753
Author: Roger Leigh <rleigh@debian.org>
754
Date: Sun Apr 26 18:56:52 2009 +0100
756
[buildd-vlog] Make it work and distribute with manual page
758
commit 2d6a48bfe885baa09417d91d0a5b3f2f89acf150
759
Author: Roger Leigh <rleigh@debian.org>
760
Date: Sun Apr 26 18:24:09 2009 +0100
762
[Sbuild::Build] Eliminate last uses of main::PLOG
764
commit 5fb93d1817f285ffe6bce7bb17d757fdf1c382b0
765
Author: Roger Leigh <rleigh@debian.org>
766
Date: Sun Apr 26 17:09:45 2009 +0100
768
[Sbuild::Log] Split into generic Sbuild::LogBase
770
Retain sbuild-specific log functionality in Sbuild::Log, and
771
move generic logging infrastructure into Sbuild::LogBase for
772
reuse by buildd and wanna-build.
774
Restore --nolog option operation.
776
Unify logging paths for all combinations of verbose/nolog
777
to improve robustness. All logging is now performed in a
778
separate logging process under all use cases.
780
The logging process uses a user-specified lambda function
781
for doing the logging to enable the addition of timestamps
786
commit 2f9448d7032c45966d2fc6e954ec7f5e6095fe2b
787
Author: Roger Leigh <rleigh@debian.org>
788
Date: Sun Apr 26 11:44:57 2009 +0100
790
[Sbuild::Sysconfig] Add SSH
792
commit 3c630f43f92c0d6b732f63640a1b639f9ba54a6d
793
Author: Roger Leigh <rleigh@debian.org>
794
Date: Sun Apr 26 22:19:38 2009 +0100
796
[debian] buildd.cron.d: Enable cron jobs
798
commit 953c51f699f89f548f17a8268fa59877fa1693ed
799
Author: Roger Leigh <rleigh@debian.org>
800
Date: Sun Apr 26 22:17:46 2009 +0100
802
[debian] preinst maintainer scripts are executable
804
commit 6021424441bfd6f8e5834399062034d366fdefa9
805
Author: Roger Leigh <rleigh@debian.org>
806
Date: Sun Apr 26 21:54:13 2009 +0100
808
[build] Add all buildd directories
810
commit 071d71538fa600e9da73a4029ae05b1551346a59
811
Author: Roger Leigh <rleigh@debian.org>
812
Date: Sun Apr 26 21:53:38 2009 +0100
814
[debian] buildd.postinst: Set ownership and permissions for all buildd dirs
816
commit 0df118d59e3d38139844a04bf998bd7f26c2b172
817
Author: Roger Leigh <rleigh@debian.org>
818
Date: Sun Apr 26 21:53:08 2009 +0100
820
[debian] Correct getent conditional in maintainer scripts
822
commit 3db3a9cdc0bb50ead3706bcd352dc25c6f5aba4c
823
Author: Roger Leigh <rleigh@debian.org>
824
Date: Sun Apr 26 21:52:10 2009 +0100
826
[debian] Update buildd init script to work
828
commit f1d4f027ac2302066f508f8475cf958070ee3889
829
Author: Roger Leigh <rleigh@debian.org>
830
Date: Sun Apr 26 20:56:28 2009 +0100
832
[debian] Install buildd-abort symlink compressed and depend on adduser
834
commit de7dccdf650751af231c11a887be6c6a5ad2c6bd
835
Author: Roger Leigh <rleigh@debian.org>
836
Date: Sun Apr 26 20:42:38 2009 +0100
838
[debian] Install all directories under /var
840
Remove /var/sbuild/srcdep-lock, since it's only used inside the
843
commit c19f53e9da6a0ff0a7de97d76690b6cd07ca02f7
844
Author: Roger Leigh <rleigh@debian.org>
845
Date: Sun Apr 26 20:43:25 2009 +0100
847
[build] Install /var/lib/buildd and /var/lib/sbuild
849
commit 2dfd604c42d98021999bcbbdce04a214462245e3
850
Author: Roger Leigh <rleigh@debian.org>
851
Date: Sun Apr 26 20:26:17 2009 +0100
853
[debian] buildd: Add maintainer scripts
855
commit ebfdc2f1e3bc73d768c24e104d9952c2ff6287b9
856
Author: Roger Leigh <rleigh@debian.org>
857
Date: Sun Apr 26 20:23:47 2009 +0100
859
[debian] sbuild: Update maintainer scripts
861
commit 40607ec5e5290789b4b30adec3b638e0ef54bd29
862
Author: Roger Leigh <rleigh@debian.org>
863
Date: Sun Apr 26 11:42:02 2009 +0100
865
[.gitignore] Ignore buildd and debhelper files
867
commit a4bdc24376d3ab3a62bafe74abc7935ccd28c6e6
868
Author: Roger Leigh <rleigh@debian.org>
869
Date: Mon Apr 20 22:15:33 2009 +0100
871
[debian] Restore buildd package
873
commit 570cb7754c9b68d9e0cbdf9de998587615cdeb23
874
Author: Roger Leigh <rleigh@debian.org>
875
Date: Sun Apr 26 14:14:10 2009 +0100
877
[Sbuild::Build] Don't fail on apt-get update error in buildd mode
879
commit 5a4ec6c3bfb27ef13945f4f3234a04a205587229
880
Author: Roger Leigh <rleigh@debian.org>
881
Date: Sat Apr 18 11:16:52 2009 +0100
883
[db] Add schema table to track schema change history
885
commit d568b8df546218b0d949772a9650928f0770a07f
886
Author: Roger Leigh <rleigh@debian.org>
887
Date: Sat Apr 18 11:16:18 2009 +0100
891
commit 985579b26f5f8efba31fcfb502697a5e92eceb07
892
Author: Roger Leigh <rleigh@debian.org>
893
Date: Sat Apr 18 11:14:50 2009 +0100
895
[debian] Close #524564
897
commit 8951e06623f1a4213aa075590ab3b72bf4fdd79a
898
Author: Roger Leigh <rleigh@debian.org>
899
Date: Sat Apr 18 11:10:05 2009 +0100
901
[Conf] Make $HOME visible in all configuration files
903
commit e79e71f17396841adc42c4f42c3e4167bca61f89
904
Author: James Vega <jamessan@debian.org>
905
Date: Sat Apr 18 11:08:43 2009 +0100
907
Sbuild::Conf] Declare $HOME as a global variable.
909
This allows config files to continue using $HOME instead of requiring
910
them to use $ENV{'HOME'}. (Closes: #524564)
912
Signed-off-by: Roger Leigh <rleigh@debian.org>
914
commit 552c8ffd7f80c97290c38b461b3a45781aa71e9f
915
Author: Roger Leigh <rleigh@debian.org>
916
Date: Sat Apr 18 10:52:34 2009 +0100
918
[Buildd::Conf] Don't use logger() which isn't available at startup
920
Calling logger() requires open_log to be called, and this hasn't
921
necessarily happened. Use STDERR for the time being.
923
commit 3be172608585c4cf745886b0058009ad5a8c46e0
924
Author: Roger Leigh <rleigh@debian.org>
925
Date: Sat Apr 18 10:51:26 2009 +0100
927
[Sbuild::Conf] Only set array and hash variables if used.
929
If set unconditionally, they override the defaults.
931
commit 109730daccd51ed3711dfa156c6c77241376ff82
932
Author: Roger Leigh <rleigh@debian.org>
933
Date: Sat Apr 18 10:50:17 2009 +0100
935
[man] Update sbuild-hold description
937
commit e89bf63dc538faccf22ab75b0a7837f1cb34cf5a
938
Merge: d9aae45 4daa9c7
939
Author: Roger Leigh <rleigh@debian.org>
940
Date: Sat Apr 18 10:32:17 2009 +0100
942
Merge branch 'buildd-conf'
947
commit 4daa9c7281a7508154ea0dc3131f2564f10145f1
948
Author: Roger Leigh <rleigh@debian.org>
949
Date: Fri Apr 17 00:42:45 2009 +0100
951
[buildd] Reflow wanna-build command running over one line
953
commit f897d9d84c537eeefb627f0e8c13c6b599861bf9
954
Author: Roger Leigh <rleigh@debian.org>
955
Date: Fri Apr 17 00:42:08 2009 +0100
957
[buildd] Force complete configuration reload on SIGUSR1
959
commit beed360c64902a5317522a882680ad3c7b5af5bf
960
Author: Roger Leigh <rleigh@debian.org>
961
Date: Fri Apr 17 00:41:21 2009 +0100
963
[buildd] Correctly parse PID from buildd.pid on restart
965
commit 10cbf332c1ef6d436123fb5412391f1ab1cf7890
966
Author: Roger Leigh <rleigh@debian.org>
967
Date: Fri Apr 17 00:26:12 2009 +0100
969
[buildd] Reimplement configuration file reloading
971
commit 2b6c544a963467904186d9b899e47db44aea5611
972
Author: Roger Leigh <rleigh@debian.org>
973
Date: Fri Apr 17 00:25:45 2009 +0100
975
[buildd] Remove redundant use of $conf
977
commit 3247ed34b00b004d3ea7dc7a4a6ad0a699904f16
978
Author: Roger Leigh <rleigh@debian.org>
979
Date: Tue Apr 14 21:46:43 2009 +0100
981
[buildd-abort] Remove and replace with a symlink to sbuild-abort
983
sbuild-abort is a perl rewrite of the original buildd-abort imported
984
into sbuild. buildd-abort is now a symlink to the current
987
commit e14fc0031ba3aa97eea32bcfe8322186ae727ddf
988
Author: Roger Leigh <rleigh@debian.org>
989
Date: Mon Apr 13 23:11:19 2009 +0100
991
[buildd*] Add generic options parsing logic
993
commit 53fa075c405827550fb5f4da9bd1f8aa46c7ddb5
994
Author: Roger Leigh <rleigh@debian.org>
995
Date: Mon Apr 13 23:07:16 2009 +0100
997
[Buildd::Conf] Derive from Sbuild::ConfBase
999
commit d9aae4581757dfbb6dc88002b88163ba521a2e96
1000
Merge: d9359ce 1ba6bf1
1001
Author: Philipp Kern <pkern@debian.org>
1002
Date: Mon Apr 13 21:14:05 2009 +0200
1004
Merge commit 'origin/master'
1006
commit d9359ce7f228b4ee0b728ab093eadfe6d7d28131
1007
Author: Philipp Kern <pkern@debian.org>
1008
Date: Mon Apr 13 12:13:18 2009 +0200
1010
[buildd] correct invalid function signature
1012
And it only took half an hour of debugging to get to that.
1014
Signed-off-by: Philipp Kern <pkern@debian.org>
1016
commit 020576186c6d9d3c3161299be937501f695ebdd4
1017
Author: Philipp Kern <pkern@debian.org>
1018
Date: Mon Apr 13 11:31:46 2009 +0200
1020
[Buildd::Conf] fix apt_get, sudo typo; add schroot
1022
Signed-off-by: Philipp Kern <pkern@debian.org>
1024
commit 1ba6bf1f7a5b6c954adc49ee43e5165bdfed5809
1025
Author: Roger Leigh <rleigh@debian.org>
1026
Date: Sun Apr 12 16:44:09 2009 +0100
1028
[debian] Close #523670
1030
commit 665d2e95e652d6b80ed9a699f9bb503cb27a763d
1031
Author: Roger Leigh <rleigh@debian.org>
1032
Date: Sun Apr 12 16:07:49 2009 +0100
1034
[Sbuild::Options] Remove unused modules
1036
commit d923a3ddeb17390d8cbe5d47fe324fbf6ed72997
1037
Author: Roger Leigh <rleigh@debian.org>
1038
Date: Sun Apr 12 16:07:09 2009 +0100
1040
[etc] 50sbuild: Only change directory permissions to 02775
1042
commit 4fb36df7b4cf06a9bbbd132be29acc74e7c8e69c
1043
Author: Roger Leigh <rleigh@debian.org>
1044
Date: Sun Apr 12 16:06:22 2009 +0100
1046
[Sbuild::Conf] Don't automatically check for sbuild group membership
1048
bin/*: Add check if appropriate.
1050
Also skip check if running as root.
1052
commit 3bb2408846c378b23fd88749de8422aa1976ab33
1053
Author: Roger Leigh <rleigh@debian.org>
1054
Date: Sun Apr 12 16:01:28 2009 +0100
1056
[bin] All sbuild programs use generic Sbuild::OptionsBase options
1058
commit 72de42c96d0bcfd8664cee9035f5692c162d53a3
1059
Author: Roger Leigh <rleigh@debian.org>
1060
Date: Sun Apr 12 02:49:09 2009 +0100
1062
[Sbuild::Sysconfig] Use double quotes to allow prefix expansion
1064
commit 8297ccbe5e0ec8056b0fc2f7ddce4ba501a1a393
1065
Author: Roger Leigh <rleigh@debian.org>
1066
Date: Sun Apr 12 02:48:16 2009 +0100
1068
[WannaBuild::Options] Remove options duplicated in Sbuild::OptionsBase
1070
commit ed6c917524e7b9e264f3185f6a1405bd6bea62a2
1071
Author: Roger Leigh <rleigh@debian.org>
1072
Date: Sun Apr 12 02:47:28 2009 +0100
1074
[WannaBuild::Options] Use Sbuild::OptionsBase
1076
commit fc6b07dffd34691616968dbc6910979b2f688701
1077
Author: Roger Leigh <rleigh@debian.org>
1078
Date: Sun Apr 12 00:28:41 2009 +0100
1080
[Sbuild::OptionsBase] Generic options parsing base class
1082
Sbuild::Options derives from Sbuild::OptionsBase, which
1083
provides basic --help, --version, --verbose, --quiet and
1084
--debug options common to all programs.
1086
commit dcf030bdda12df5018f68ddee9129fb978d23abc
1087
Author: Roger Leigh <rleigh@debian.org>
1088
Date: Sun Apr 12 00:02:42 2009 +0100
1090
[debian] Close #475777
1092
commit af44d7adf82cf51b7392893a5f11f272f7c9ea6b
1093
Author: Roger Leigh <rleigh@debian.org>
1094
Date: Sat Apr 11 23:57:28 2009 +0100
1096
[sbuild] Avoid warning if no packages given
1098
commit 6a22249bcc44226e8adffbec4236e6e09e45eabf
1099
Author: Roger Leigh <rleigh@debian.org>
1100
Date: Sat Apr 11 23:56:08 2009 +0100
1102
[Sbuild::Conf] Move --append-to-version check from Sbuild::Options
1104
commit 623512a078f61e714d6edd33be64c77a76ebd835
1105
Author: Tim Abbott <tabbott@mit.edu>
1106
Date: Sat Apr 11 23:46:46 2009 +0100
1108
[sbuild] Add support for appending a tag at the end of version numbers
1110
Signed-off-by: Tim Abbott <tabbott@mit.edu>
1111
Signed-off-by: Roger Leigh <rleigh@debian.org>
1113
commit 6434176b3279fdc39d96fb6aca2777c33934aca8
1114
Author: Roger Leigh <rleigh@debian.org>
1115
Date: Sat Apr 11 20:00:37 2009 +0100
1117
[Sbuild::Build] Add callback trigger for status changes
1119
sbuild will rewrite build-progress on status changes.
1121
commit 76bff6f39e965b888265094321f54b3d3c52636f
1122
Author: Roger Leigh <rleigh@debian.org>
1123
Date: Sat Apr 11 20:00:02 2009 +0100
1125
[buildd-vlog] Use correct build-progress status name
1127
Use "building", not "currently building".
1129
commit 71dc4fcbabf45383eceea8d93d49af2b9bf0bd15
1130
Author: Roger Leigh <rleigh@debian.org>
1131
Date: Sat Apr 11 19:21:05 2009 +0100
1133
[build] Move all job handling code from Sbuild::Build
1135
Sbuild::Build only knows how to build one package. Managing jobs
1136
is not its responsibility, and is a layering violation. Push all
1137
job management, including skipping, error reporting, wanna-build
1138
givebacks, etc. right up to the sbuild mainloop. It can
1139
subsequently be moved out of sbuild into buildd. Unless running in
1140
batch mode, none of these features are enabled.
1142
Added a JOB_FILE configuration property for the build status
1145
commit 6598e76dca42b590a5a223997d329e710078d45b
1146
Author: Roger Leigh <rleigh@debian.org>
1147
Date: Sat Apr 11 13:52:12 2009 +0100
1149
[Sbuild::Build] Remove username from logs, and create build symlinks
1151
When in user mode, create a $dsc_$arch.build symlink in place of
1152
the current symlink.
1154
In the log directory, don't embed the username in the log file name.
1156
commit 817aea8c6dbf7f953765d42a78eb938ae156bdf0
1157
Author: Roger Leigh <rleigh@debian.org>
1158
Date: Sat Apr 11 13:50:19 2009 +0100
1160
[Sbuild::Build] Simplify binNMU version handling
1162
binNMU versions are all now computed at initialisation time,
1163
and we distinguish between the orignal version (OVersion), real
1164
version with binNMU version added (Version) and real version with
1165
epoch removed (SVersion).
1167
Old redundant tree checks for binNMU version checking and changelog
1168
modification have been removed.
1170
commit 8bf803251bd4c9cda914afd67e397b0cc8d20b73
1171
Author: Roger Leigh <rleigh@debian.org>
1172
Date: Sat Apr 11 12:43:31 2009 +0100
1174
[Sbuild] Support manually specified build dependencies
1176
Retire parse_manual_srcdeps and --force-depends and --add-depends
1179
Replace with --add-depends, --add-conflicts, --add-depends-indep
1180
and --app-conflicts-indep to fully support modern build dependency
1181
handling rather than the old sourcedeps format. Append directly
1182
to package build dependencies.
1184
commit de53710f379b909ee163195383202b4507829cd0
1185
Author: Roger Leigh <rleigh@debian.org>
1186
Date: Sat Apr 11 12:42:23 2009 +0100
1188
[debian] control: Update to Standards Version 3.8.1
1190
commit 2288703f3b86f469585493b2a684c69da8214101
1191
Author: Roger Leigh <rleigh@debian.org>
1192
Date: Sat Apr 11 12:39:57 2009 +0100
1194
[build] Bump version to 0.58.3
1196
commit 6bd7e28467d9973e2d297a2603e4ca3c4d7f1813
1197
Author: Roger Leigh <rleigh@debian.org>
1198
Date: Sat Apr 11 11:40:06 2009 +0100
1200
[Sbuild::Build] Move initial setup from sbuild into run method
1202
commit 6baf7247ad7caf8b7361fac40e66adcc0980b961
1203
Author: Roger Leigh <rleigh@debian.org>
1204
Date: Sat Apr 11 10:50:55 2009 +0100
1206
[Sbuild::Conf] Move check_group_membership from sbuild
1
1208
commit 2a35efe5454ae358a27a0d632233e9295f9d8aa9
2
1209
Merge: 0ed0c0e 6c6c949
3
1210
Author: Roger Leigh <rleigh@debian.org>