-
Committer:
Bazaar Package Importer
-
Author(s):
Kees Cook
-
Date:
2010-04-05 12:38:24 UTC
-
mfrom:
(2.1.15 sid)
-
Revision ID:
james.westby@ubuntu.com-20100405123824-ohfbuu5pz18zgrzk
Tags: 1:2.4.4ubuntu1
* Merge from debian unstable (LP: #555967). Remaining changes:
- debian/{control,rules}: add quilt for patch management.
- Debian bug 455082:
- default-settings.patch: change rsync defaults.
- silence-errors.patch: throw away find errors.
- functionalize.patch: prepare for batching of non-deb files.
- drop-redundant-rsync.patch: clean up logic in rsync batching.
- check_file-return.patch: report why a file needs to sync.
- command-exit-checking.patch: check exit codes of commands.
- skip-installer.patch: allow specific releases to be skipped (Debian
bug 576576).
- rsync-retries.patch: retry if rsync batch fails connection (Debian
bug 576577).
* Dropped rsync Release file batching for now, as it makes merging
much more difficult.