lp:~stefanor/ubuntu/natty/debmirror/merge-and-64345
- Get this branch:
- bzr branch lp:~stefanor/ubuntu/natty/debmirror/merge-and-64345
Branch merges
- Kees Cook: Approve
-
Diff: 881 lines (+312/-162)18 files modifieddebian/changelog (+43/-0)
debian/control (+5/-5)
debian/copyright (+8/-18)
debian/manpages (+1/-0)
debian/patches/check_file-return.patch (+3/-5)
debian/patches/command-exit-checking.patch (+4/-6)
debian/patches/default-settings.patch (+9/-11)
debian/patches/drop-redundant-rsync.patch (+5/-7)
debian/patches/functionalize.patch (+7/-9)
debian/patches/rsync-retries.patch (+3/-5)
debian/patches/series (+1/-0)
debian/patches/silence-errors.patch (+7/-9)
debian/patches/skip-installer.patch (+11/-13)
debian/patches/ubuntu-settings.patch (+167/-0)
debian/rules (+1/-8)
debmirror (+10/-38)
examples/debmirror.conf (+0/-1)
mirror_size (+27/-27)
Branch information
- Owner:
- Stefano Rivera
- Status:
- Development
Recent revisions
- 11. By Stefano Rivera
-
ubuntu-
settings. patch: Changed defaults to download Ubuntu (LP: #64345),
replaced most instances of Debian with Ubuntu in the documentation.
Changed examples to be more Ubuntu relevent, patch thanks to Karl Goetz. - 10. By Stefano Rivera
-
* Merge from debian unstable. 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).
* New maintainer. Frans, we'll miss you.
Closes: #595690
* Moved to git; grafted in debmirror's original development
history from my home directory. Closes: #594976
* Fix filename of mirror_size file in man page. Closes: #594975
* Drop support for the --adddir option which was obsoleted log ago.
* Ensure MD5SUMS files for D-I images get updated. Closes: #590667.
Thanks to Stefan Kisdaroczi for reporting the issue and for the patch.
* Update archive size information (without Etch as that has been archived). - 8. By Kees Cook
-
* 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. - 7. By Anders Kaseorg
-
Fix a regression in the estimated download size calculation introduced
by skip-installer.patch. (LP: #34376) - 6. By Kees Cook
-
* debian/
{control, rules}: Added "quilt" to manage Ubuntu set of patches.
* Extracted earlier changes into logical patches:
- gpg-key-documentation. patch (debian bug 451157).
- gzreadline-update. patch (debian bug 451021).
* Add rsync-batching.patch: enable sane rsync batching instead of
one-at-a-time fetches (debian bug 455082).
* Add rsync-retries.patch: retry rsyncs if server connections time out.
* Add skip-installer.patch: handle installer section and skipping,
thanks to Jamie Strandboge. - 5. By Kees Cook
-
* Patched to handle changes to Compress::Zlib gzreadline symantics
(LP: #157362).
* Update documentation to detail the correct keyring to use (LP: #90546). - 4. By Goswin von Brederlow
-
* Add dependency for libdigest-sha1-perl (ACK NMU) (Closes: #386707)
* Change manpage entry for --pdiff (Closes: #386697)
* Fix Release.gpg check to use gpgv (Closes: #400526)
* Fix use of uninitialized value in addition
* Count errors in pdiff files as small errors (Closes: #400054)
* Cleanup tempfiles (Closes: 399834)
* Fix manpage permissions with patch by (Closes: #399058)
"Dmitry E. Oboukhov" <email address hidden>
* Skip pdiff files if patch binary is missing (Closes: #401245)
* Skip pdiff files if ed binary is missing and recommend it (Closes: #397936) - 2. By Goswin von Brederlow
-
* Add NEWS.Debian (Closes: #289025)
* Add ~/.debmirror.conf and /etc/debmirror.conf (Closes: #244023)
* Typo fix by Nico Golde and more (Closes: #292791)
* Add example config file
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/natty/debmirror