summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog22
1 files changed, 15 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 65423a754..1820b2cbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
-apt (0.6.34ubuntu1) hoary; urgency=low
-
- * Implement MaxSize and MaxAge, MinAge in apt.cron.daily, to prevent the
- cache from growing too large (Ubuntu #6761)
- * "apt-key update" calls gpg with "--ignore-time-conflict (ubuntu #7536)
-
- -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 23 Mar 2005 16:45:33 +0100
+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
+ * 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
apt (0.6.34) hoary; urgency=low