summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorChristian Perrier <bubulle@debian.org>2005-05-11 11:39:47 +0000
committerChristian Perrier <bubulle@debian.org>2005-05-11 11:39:47 +0000
commit8ccff71930e8c8ae0dcc85cf30a2644d10a01640 (patch)
tree1deed9ccdf41368a2b7e05c2b35a574cc89e71d9 /debian/changelog
parent3fd8a7bedb5a3181a903e399df28293e1e296db3 (diff)
Revert changes to debian/changelog and debian/apt.cron.daily
Revert changes I seem to have inadvertently made in those two files
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog10
1 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 8df894e16..87e713d3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,9 +13,17 @@ apt (0.6.36) experimental; urgency=low
apt (0.6.35) hoary; urgency=low
- * Merge apt--mvo--0:
+ * Merge apt--mvo--0 (incorporates 0.6.34ubuntu1):
- Implement MaxSize and MaxAge in apt.cron.daily, to prevent the cache
from growing too large (Ubuntu #6761)
+ - some comments about the pkgAcqMetaSig::Custom600Headers() added
+ - use gpg --with-colons
+ - commented the ftp no_proxy unseting in methods/ftp.cc
+ - added support for "Acquire::gpgv::options" in methods/gpgv.cc
+ * Merge bubulle@debian.org--2005/apt--main--0
+ - Make capitalization more consistent
+ - Un-fuzzy translations resulting from capitalization changes
+ - Italian translation update
-- Matt Zimmerman <mdz@ubuntu.com> Mon, 7 Mar 2005 20:08:33 -0800