diff options
| author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-06-28 18:52:48 +0000 |
|---|---|---|
| committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-06-28 18:52:48 +0000 |
| commit | 3014df6fc4aa647e82fa1d95a0fe4ee856a1a6d5 (patch) | |
| tree | 79bd2ce193b197b3522e295a40d63c67b514872f /debian | |
| parent | 8908efc65fdd7f6b5c59e504d3840b9d33cb7fb8 (diff) | |
Merge with mainline
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-99
Finalize 0.6.39
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index ab138e33e..cb092b803 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +apt (0.6.39ubuntu1) breezy; urgency=low + + * Michael Vogt + - Change debian/bugscript to use #!/bin/bash (Closes: #313402) + - Fix a incorrect example in the man-page (closes: #282918) + - Support architecture-specific extra overrides + (closes: #225947). Thanks to Anthony Towns for idea and + the patch, thanks to Colin Watson for testing it. + - better report network timeouts from the methods to the acuire code, + only timeout once per sources.list line + + -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:52:24 -0700 + apt (0.6.39) unstable; urgency=low * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 @@ -6,14 +19,6 @@ apt (0.6.39) unstable; urgency=low * Merge aggregated translation updates: bubulle@debian.org--2005/apt--main--0 * Update priority of apt-utils to important, to match the override file - * Michael Vogt - - Change debian/bugscript to use #!/bin/bash (Closes: #313402) - - Fix a incorrect example in the man-page (closes: #282918) - - Support architecture-specific extra overrides - (closes: #225947). Thanks to Anthony Towns for idea and - the patch, thanks to Colin Watson for testing it. - - better report network timeouts from the methods to the acuire code, - only timeout once per sources.list line * Install only one keyring on each branch (Closes: #316119) -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:35:21 -0700 @@ -39,6 +44,9 @@ apt (0.6.38) unstable; urgency=low (closes ubuntu #9935) -- Matt Zimmerman <mdz@debian.org> Sat, 25 Jun 2005 09:51:00 -0700 +======= + -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:51:09 -0700 +>>>>>>> MERGE-SOURCE apt (0.6.38) unstable; urgency=low |