summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog12
1 files changed, 8 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 974ba5ec7..45b381148 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,10 +17,14 @@ apt (0.6.35) hoary; urgency=low
* 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
+ - 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